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

New commits:
commit fb45f298effbf11ca75d60b2810bf2899deb401d
Author: Julien Cristau <[email protected]>
Date:   Sat Jan 16 16:49:09 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 a84d75c..69d00a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-encodings (1:1.0.3-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:48:00 +0000
+
 xfonts-encodings (1:1.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index e92f603..8e65d61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ build: build-stamp
 build-stamp:
        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
@@ -53,7 +53,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 configure install-sh missing mkinstalldirs
        rm -f config.guess config.sub
        find -name Makefile.in -delete
@@ -65,7 +65,7 @@ install: build
        dh_testroot
        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


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

Reply via email to