debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit d1a37e1a588090eda1e1557fb4b766ac3355870a Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:49:08 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 970432d..c6e788a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xbitmaps (1.1.0-2) UNRELEASED; urgency=low + + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:47:58 +0000 + xbitmaps (1.1.0-1) unstable; urgency=low [ Andres Salomon ] diff --git a/debian/rules b/debian/rules index e490329..11798ae 100755 --- a/debian/rules +++ b/debian/rules @@ -34,12 +34,12 @@ build: build-stamp build-stamp: dh_testdir autoreconf -vfi - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && CFLAGS="$(CFLAGS)" \ + mkdir -p build + cd build && CFLAGS="$(CFLAGS)" \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --sysconfdir=/etc \ $(confflags) - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: @@ -51,7 +51,7 @@ clean: 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 aclocal.m4 config.h.in configure install-sh missing rm -f config.guess config.sub find -name Makefile.in -delete @@ -64,7 +64,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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
