[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxau: Changes to 'debian-unstable'



 debian/changelog |    7 +++++++
 debian/rules     |   14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 4e2067576607e090ddb05e75346e9383d2feac7b
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 16 16:48:51 2010 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 9648e07..abae1ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxau (1:1.0.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:35 +0000
+
 libxau (1:1.0.5-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index eb93bba..029cf26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,9 @@ endif
 configure: $(STAMP_DIR)/patch
 	autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
-	mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-	cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+	mkdir -p build
+	cd build && \
 	../configure \
 	  --prefix=/usr \
 	  --mandir=\$${prefix}/share/man \
@@ -46,10 +46,10 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
 	  CFLAGS="$(CFLAGS)"
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
 	dh_testdir
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+	cd build && $(MAKE)
 
 	touch build-stamp
 
@@ -62,7 +62,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
 	rm -f $$(find -name Makefile.in)
 	rm -f compile config.guess config.sub configure depcomp install-sh
 	rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in
@@ -75,7 +75,7 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install


Reply to: