From 43102d84778d3dff9c2bc823040538cb75606984 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 27 Apr 2014 14:57:29 +0000 Subject: [PATCH] rpmdist.mk: Next attempt Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index a36ab7f7..cc03bf38 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -137,7 +137,7 @@ $(DIST_PCKG_SRPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi - cp $(RPMS_DIR)/$(PCKG_RPM_RUN_I386) $(dir $@)/ + cp $(addprefix $(RPMS_DIR)/,$(notdir $(DIST_PCKG_RPM))) $(dir $@)/ $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION echo $(CURRENT_$*) > $@ @@ -251,7 +251,7 @@ rpm-check-release: fi rpm-release: rpm-update-release - @if ! grep -q "^$(LAST_RPM_VERSION)\$" VERSION; then \ + @if ! grep -q "^$(LAST_RPM_VERSION)$$" VERSION; then \ $(check_cvs_sync) ;\ echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\ "$(LAST_RPM_VERSION), building a new release" ;\