debian/changelog | 2 ++ debian/rules | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 335f75e054e94212c4f12c787da4b4c6c555c1b7 Author: Julien Cristau <[email protected]> Date: Sat Jan 23 13:45:47 2010 +0100 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 a269cf2..03fe340 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ twm (1:1.0.4-3) UNRELEASED; urgency=low * postinst: drop obsolete cleanup for /usr/bin/X11/twm x-window-manager alternative. * Remove myself from Uploaders. + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! -- Julien Cristau <[email protected]> Wed, 23 Dec 2009 17:51:35 +0100 diff --git a/debian/rules b/debian/rules index b1a9126..57ff499 100755 --- a/debian/rules +++ b/debian/rules @@ -37,12 +37,12 @@ build: genscripts patch build-stamp build-stamp: dh_testdir - mkdir obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + mkdir build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --sysconfdir=/etc \ $(confflags) CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) touch build-stamp @@ -55,7 +55,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 @@ -65,7 +65,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 install -d debian/tmp/etc/X11/twm install -m 644 src/system.twmrc debian/tmp/etc/X11/twm/system.twmrc-menu install -d debian/tmp/usr/share/xsessions -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
