debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit fb13f1fa73cc74ed0effdacaeff17664fc3a326d Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:49:07 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 06af7b8..ea7b3a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-docs (1:1.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:57 +0000 + xorg-docs (1:1.5-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/rules b/debian/rules index 5ae6087..d58feb3 100755 --- a/debian/rules +++ b/debian/rules @@ -36,15 +36,15 @@ build: build-stamp build-stamp: $(STAMP_DIR)/prepare 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 --disable-shared \ $(confflags) CFLAGS="$(CFLAGS)" \ --enable-html \ --enable-txt \ --enable-ps - $(MAKE) -C obj-$(DEB_BUILD_GNU_TYPE) + $(MAKE) -C build >$@ clean: xsfclean @@ -52,7 +52,7 @@ clean: xsfclean dh_testroot rm -f build-stamp rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f aclocal.m4 config.guess config.sub configure install-sh rm -f missing find -name Makefile.in -delete @@ -64,7 +64,7 @@ install: build dh_clean -k dh_installdirs - $(MAKE) -C obj-$(DEB_BUILD_GNU_TYPE) DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install mv $(CURDIR)/debian/tmp/usr/share/man/man7/Standards.7 \ $(CURDIR)/debian/tmp/usr/share/man/man7/XStandards.7 mv $(CURDIR)/debian/tmp/usr/share/man/man7/Consortium.7 \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
