Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!

2 files changed, 12 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index abbbb16..f228f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.5+2) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:15 +0000
+
 xutils-dev (1:7.5+1) unstable; urgency=low
 
   * Add watch files and debian/rules target to download tarballs.
diff --git a/debian/rules b/debian/rules
index e943e5b..09d76a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,12 +42,12 @@ build-stamp: $(STAMP_DIR)/genscripts $(foreach dir, $(SUBDIRS), $(STAMP_DIR)/bui
 	>$@
 
 $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
-	mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
-	cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+	mkdir -p $*-build
+	cd $*-build && \
 		../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info $(confflags) \
 		CFLAGS="$(CFLAGS)"
-	cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+	cd $*-build && \
 		$(MAKE)
 	>$@
 
@@ -60,7 +60,7 @@ clean: xsfclean
 	rm -f */config.cache */config.log */config.status
 	rm -f conftest* */conftest*
 	rm -rf autom4te.cache */autom4te.cache
-	rm -rf *-obj-*
+	rm -rf *-build
 
 	dh_clean
 
@@ -71,7 +71,7 @@ install: build
 	dh_installdirs
 
 	set -e; for FILE in $(SUBDIRS); do \
-		$(MAKE) -C $${FILE}-obj-$(DEB_BUILD_GNU_TYPE) DESTDIR=$(CURDIR)/debian/tmp install; \
+		$(MAKE) -C $${FILE}-build DESTDIR=$(CURDIR)/debian/tmp install; \
 	done
 
 # Build architecture-dependent files here.