xfs: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit e78650fe4cdf18612881564042ae635a0765d022
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:36 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 21f1938..298f47a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfs (1:1.0.8-7) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:11 +0000
+
xfs (1:1.0.8-6) unstable; urgency=low
* QA upload.
diff --git a/debian/rules b/debian/rules
index edc47a8..60507e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,14 +39,14 @@ build: build-stamp
build-stamp: $(STAMP_DIR)/patch $(STAMP_DIR)/genscripts
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 \
--sysconfdir=/etc $(confflags) \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -59,7 +59,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 INSTALL aclocal.m4 config.guess config.sub configure
rm -f depcomp install-sh missing mkinstalldirs xfs-config.h.in
rm -f $$(find -name Makefile.in)
@@ -76,7 +76,7 @@ install: build
cp $(CURDIR)/debian/$(PACKAGE).insserv \
$(CURDIR)/debian/$(PACKAGE)/etc/insserv.conf.d/$(PACKAGE)
- 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: