[syrthes/master] debian/rules: better handling of EXPLICIT_VERSION

[Gilles Filippini]

---
 debian/rules |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index c461389..a8e1eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,9 @@
 #export DH_VERBOSE=1
 
 NOREVISION_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-' | sed 's/\.dfsg.*$$//')
-SCIENCE_EXPLICIT_VERSION := $(shell set -e; if [ "$(SCIENCE_EXPLICIT_VERSION)" == "yes" ]; then echo "$(NOREVISION_VERSION)"; fi)
+EXPLICIT_VERSION := $(shell set -e; if [ "$(SCIENCE_EXPLICIT_VERSION)" == "yes" ]; then echo "-$(NOREVISION_VERSION)"; fi)
 SYRTHES_HOME=usr/lib/syrthes/$(NOREVISION_VERSION)
-INSTALL_DIR=$(CURDIR)/debian/syrthes$(SCIENCE_EXPLICIT_VERSION)
+INSTALL_DIR=$(CURDIR)/debian/syrthes$(EXPLICIT_VERSION)
 
 include /usr/share/quilt/quilt.make
 
@@ -45,7 +45,7 @@ clean-patched:
 	cd $(CURDIR)/bin && SYRTHES_HOME=$(CURDIR) $(MAKE) distclean
 
 	dh_clean 
-	sed "s/@EXPLICIT_VERSION@/$(SCIENCE_EXPLICIT_VERSION)/;s/@VERSION@/$(NOREVISION_VERSION)/" debian/control.in > debian/control
+	sed "s/@EXPLICIT_VERSION@/$(EXPLICIT_VERSION)/;s/@VERSION@/-$(NOREVISION_VERSION)/" debian/control.in > debian/control
 	sed "s!@SYRTHES_HOME@!$(SYRTHES_HOME)!" debian/dirs.in > debian/dirs
 
 install: build
@@ -90,9 +90,9 @@ binary-arch: install
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
-	dh_link \
-		/$(SYRTHES_HOME)/bin/syrthes_create_case /usr/bin/syrthes$(SCIENCE_EXPLICIT_VERSION)_create_case \
-		/$(SYRTHES_HOME)/bin/Linux/syrthes2ensight /usr/bin/syrthes$${SCIENCE_EXPLICIT_VERSION:+$${SCIENCE_EXPLICIT_VERSION}_}2ensight
+	EXPLICIT_VERSION=$(EXPLICIT_VERSION) && export EXPLICIT_VERSION && dh_link \
+		/$(SYRTHES_HOME)/bin/syrthes_create_case /usr/bin/syrthes$(EXPLICIT_VERSION)_create_case \
+		/$(SYRTHES_HOME)/bin/Linux/syrthes2ensight /usr/bin/syrthes$${EXPLICIT_VERSION:+$${EXPLICIT_VERSION}_}2ensight
 	dh_strip
 	dh_compress
 	dh_fixperms
-- 
1.5.6.5