debian/changelog |    5 +++++
 debian/rules     |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 0508bbf03d48cb742ee104beba6eb2803b637351
Author: Julien Cristau <[email protected]>
Date:   Sat Jan 16 16:48:47 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 2e69904..8eb0da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Install a udev rules file to autoload the driver.
   * Run udevadm trigger on postinst, and depend on udev [linux-any].
   * Add xserver-xorg-input-joystick-dev for the header and .pc files.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen <[email protected]>  Tue, 08 Dec 2009 16:32:07 +0200
 
 xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 532d383..1414a74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ 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) \
                     CFLAGS="$(CFLAGS)" 
-       cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+       cd build && $(MAKE)
        >$@
 
 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 config.guess config.sub config.h.in configure
        rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
        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
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to