[med-svn] [cluster3] 01/02: make clean between different configurations

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository cluster3.

commit 2911faa1da5926d387b79f11cdbef14bd0699c46
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 14 17:37:25 2017 +0200

    make clean  between different configurations
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4fad6f0..24c419b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,12 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 override_dh_auto_configure:
 	# build nox version first
-	CFLAGS="$(CFLAGS)" ./configure -C --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --without-x
+	CFLAGS="$(CFLAGS)" ./configure -C --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --without-x
 	$(MAKE) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 	cp src/cluster cluster.nox
+	$(MAKE) clean
 	# now configure X version
-	CFLAGS="$(CFLAGS)" ./configure -C --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-x 
+	CFLAGS="$(CFLAGS)" ./configure -C --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-x 
 
 override_dh_auto_build-arch:
 	# $(MAKE) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
@@ -44,6 +45,7 @@ override_dh_clean:
 
 override_dh_install:
 	dh_install
+	mkdir -p $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin
 	mv cluster.x $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/xcluster3
 	mv cluster.nox $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/cluster3
 	mkdir -p $(CURDIR)/debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cluster3.git