x11proto-record: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit bffe34a9f875859aea9909c032e9a1cc84d1df07
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:49:00 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 8a7d08d..98dcf20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-record (1.14-3) 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:47 +0000
+
x11proto-record (1.14-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/rules b/debian/rules
index 26a6cd6..fcc1485 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
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)
>$@
clean:
@@ -53,7 +53,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
@@ -66,7 +66,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: