debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit a9a3c5d20e0158e4c0eb190d41f717fa5d38c5fd Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 16 16:48:37 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 80fbfd8..eb2fa6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xinit (1.2.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 <jcris...@debian.org> Sat, 16 Jan 2010 16:47:13 +0000 + xinit (1.2.0-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/rules b/debian/rules index 8e3e17b..904ba24 100755 --- a/debian/rules +++ b/debian/rules @@ -36,13 +36,13 @@ build: build-stamp build-stamp: configure $(STAMP_DIR)/genscripts dh_testdir - 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) \ CFLAGS="$(CFLAGS)" MANCONF="/etc/manpath.config" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) || exit 1 + cd build && $(MAKE) || exit 1 >$@ clean: xsfclean @@ -54,7 +54,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 missing INSTALL rm -f $$(find -name Makefile.in) @@ -67,7 +67,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/xinit install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org