debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 57810f4228da7ac20e066369b0e0fdca5665be97
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:52 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 edf5ec6..6cc8a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.16.4-2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:36 +0000
+
pixman (0.16.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 88ea93d..8319e0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ autogen-stamp: $(QUILT_STAMPFN)
config: config-stamp
config-stamp: autogen-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 \
@@ -48,7 +48,7 @@ config-stamp: autogen-stamp
build: build-stamp
build-stamp: config-stamp
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch $@
@@ -61,7 +61,7 @@ clean: unpatch
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 $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in
@@ -75,7 +75,7 @@ install-stamp: build-stamp
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
touch $@
# Install architecture-dependent files here.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
