From 14f0d87c69cdc8ae956ac151a573e691e8d3dece Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 1 Jul 2011 09:28:51 +0000
Subject: [PATCH] rpmdist.mk: Another attempt on try-reinstall

---
 make/rpmdist.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 142c0cac..e3bdeb50 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -203,7 +203,7 @@ define increase_build_number
 endef
 
 define check_reinstall_old
-	true $(addprefix && test -f ,$(DIST_PACKAGE_RPM)) && make rpm-uninstall && make rpm-install
+	(true $(addprefix && test -f ,$(DIST_PACKAGE_RPM)) && make rpm-uninstall && make rpm-install)
 endef
 
 md5: 
@@ -212,6 +212,9 @@ md5:
 rpm-next-build:
 	@$(increase_build_number)
 
+try-reinstall:
+	$(check_reinstall_old)
+
 rpm-update-release:
 	@if [ "`cat HASH`" != "$(HASH)" ]; then \
 		echo + source was modified ;\
@@ -238,7 +241,7 @@ rpm-release: rpm-update-release
 		if ! grep -q $(LAST_RPM_VERSION_FILE) CVS/Entries; then \
 			cvs add $(LAST_RPM_VERSION_FILE) ;\
 		fi ;\
-		cvs commit -m "o $(shell cat $(LAST_RPM_VERSION_FILE))" $(LAST_RPM_VERSION_FILE) ;\
+		cvs commit -m "o `cat $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\
 	else \
 		echo "+ version matches latest released rpm version" ;\
 	fi