[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libfs: Changes to 'debian-unstable'



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

New commits:
commit 7c860d8fc084f723689337db44c1285cb3d7db87
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 23 13:45:48 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 f31439e..ab301ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libfs (2:1.0.2-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Remove myself from Uploaders.
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 24 Nov 2009 13:27:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 1bf2013..75cbb27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
-	cd obj-$(DEB_BUILD_GNU_TYPE) && \
+	test -d build || mkdir 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)
 
 	touch build-stamp
 
@@ -54,7 +54,7 @@ clean:
 	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
 
@@ -64,7 +64,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


Reply to: