x11proto-core: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/rules | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 84a86fa8b608e0252cd82215e56b1a635aff4e5e
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:59 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 7812f25..e9d22a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11proto-core (7.0.16-2) UNRELEASED; urgency=low
* Get rid of the x-dev transitional package.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
diff --git a/debian/rules b/debian/rules
index 84bc68b..aedb95a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,12 +38,12 @@ configure:
build: build-stamp
build-stamp: configure
dh_testdir
- 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 --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -55,7 +55,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
rm -f aclocal.m4 config.guess config.sub configure
rm -f do-not-use-config.h.in install-sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -68,7 +68,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-independent files here.
binary-indep: build install
Reply to: