x11proto-kb: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/rules | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 9484bad93c8ae68902aa3993992e987a8f6a8067
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 13:45:49 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 2bf63cc..dc31c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11proto-kb (1.0.4-2) UNRELEASED; urgency=low
* Remove myself from Uploaders.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 12:19:14 +0100
diff --git a/debian/rules b/debian/rules
index 28a3381..8fed229 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ build-stamp:
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 --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
@@ -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 configure install-sh missing mkinstalldirs
rm -f config.guess config.sub
find -name Makefile.in -delete
@@ -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: