From 2b5624daa2ed9083c7abfd6d23c04c77ca4f8f4b Mon Sep 17 00:00:00 2001 From: James Laska Date: Mon, 31 Aug 2015 13:16:59 -0400 Subject: [PATCH] Improve RPM_DIST regular expression --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c222321718..ae912c166f 100644 --- a/Makefile +++ b/Makefile @@ -83,8 +83,8 @@ MOCK_BIN ?= mock MOCK_CFG ?= # Offline TAR build parameters -DIST = $(shell echo $(RPM_DIST) | sed -e 's|^\..*\(el\)\([0-9]\)|\1|') -DIST_MAJOR = $(shell echo $(RPM_DIST) | sed -e 's|^\..*\(el\)\([0-9]\)|\2|') +DIST = $(shell echo $(RPM_DIST) | sed -e 's|^\.\(el\)\([0-9]\).*|\1|') +DIST_MAJOR = $(shell echo $(RPM_DIST) | sed -e 's|^\.\(el\)\([0-9]\).*|\2|') DIST_FULL = $(DIST)$(DIST_MAJOR) OFFLINE_TAR_NAME = $(NAME)-offline-$(DIST_FULL)-$(VERSION)-$(RELEASE) OFFLINE_TAR_FILE = $(OFFLINE_TAR_NAME).tar.gz