libpciaccess: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/rules | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit a96c5024e8e1a5cca0b5c8d51a016ff93e94b063
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:53 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 2387d1d..d36def0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libpciaccess (0.11.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for util-macros 1.4.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Sat, 02 Jan 2010 09:49:25 +0000
diff --git a/debian/rules b/debian/rules
index 1e19cca..994d180 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,9 @@ endif
configure: $(QUILT_STAMPFN)
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -40,9 +40,9 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
CFLAGS="$(CFLAGS)"
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -55,7 +55,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 mkinstalldirs config.h.in
@@ -69,7 +69,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
# Install architecture-dependent files here.
binary-arch: build install
Reply to: