debian/changelog | 7 +++++++ debian/rules | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)
New commits: commit 1a1d8f8331b77421c8447e0351684e19c23f1659 Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:52 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 c76ff39..981153b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xtrans (1.2.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 <[email protected]> Sat, 16 Jan 2010 16:47:36 +0000 + xtrans (1.2.5-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index 667db7a..d6dfd63 100755 --- a/debian/rules +++ b/debian/rules @@ -35,18 +35,18 @@ configure: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure +build/config.status: configure dh_testdir - test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + test -d build || mkdir build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --disable-shared \ $(confflags) 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) >$@ clean: xsfclean @@ -58,7 +58,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 config.h.in mkinstalldirs @@ -71,7 +71,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-independent files here. binary-indep: build install -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
