debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit a063a34796e9eb457f9d2331cd0397049308ccb3 Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:57 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 b9491d0..e3a8aed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxt (1:1.0.7-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:44 +0000 + libxt (1:1.0.7-1) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/rules b/debian/rules index 0ff1312..8053e78 100755 --- a/debian/rules +++ b/debian/rules @@ -43,15 +43,15 @@ build-stamp: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi - 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) \ --with-appdefaultdir=/etc/X11/app-defaults \ --with-xfile-search-path="/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S" CFLAGS="$(CFLAGS)" \ LDFLAGS="$(LDFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: xsfclean @@ -63,7 +63,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 aclocal.m4 compile config.guess config.h.in config.sub configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs INSTALL find -name Makefile.in -delete @@ -76,7 +76,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]
