[Pkg-cyrus-sasl2-commits] r565 - /cyrus-sasl-2.1/branches/package-consolidate/debian/rules

[roberto at users.alioth.debian.org]

Author: roberto
Date: Fri Aug 20 02:20:21 2010
New Revision: 565

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=565
Log:
Add cleanup steps and fix make invocations

Modified:
    cyrus-sasl-2.1/branches/package-consolidate/debian/rules

Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/rules?rev=565&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/rules (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/rules Fri Aug 20 02:20:21 2010
@@ -124,6 +124,9 @@
 
 	# Remove generated man pages
 	-rm -f sasl-sample-client.8 sasl-sample-server.8
+
+	# Remove build directories
+	rm -rf $(TMPBUILD_MIT) $(TMPBUILD_HEIMDAL) $(TMPPKG_MIT) $(TMPPKG_HEIMDAL)
 
 	dh_clean 
 
@@ -230,25 +233,12 @@
 build-arch-stamp: config.status
 	dh_testdir
 
-	(cd $(TMPBUILD_MIT); \
 	# Ugly hack: the CMU build system is broken.
 	# Certain symlinks get created too late, resulting in a
 	# build failure. We work around this by running make twice,
 	# ignoring the first failure.
-	-$(MAKE); \
-	# Here we run make again (this comment makes build log more readable)
-	$(MAKE); \
-	cd ..)
-
-	(cd $(TMPBUILD_HEIMDAL); \
-	# Ugly hack: the CMU build system is broken.
-	# Certain symlinks get created too late, resulting in a
-	# build failure. We work around this by running make twice,
-	# ignoring the first failure.
-	-$(MAKE); \
-	# Here we run make again (this comment makes build log more readable)
-	$(MAKE); \
-	cd ..)
+	(cd $(TMPBUILD_MIT); -$(MAKE); $(MAKE); cd ..)
+	(cd $(TMPBUILD_HEIMDAL); -$(MAKE); $(MAKE); cd ..)
 
 	# Build sample-{client,server}
 	make -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(CURDIR)