libxpm: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/rules | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 55abc5daec686b186131a5d365752e91b451a380
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 13:45:48 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 3851708..ede57a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libxpm (1:3.5.8-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 03:16:04 +0100
diff --git a/debian/rules b/debian/rules
index 530aaf8..a2f4d30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,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 $(confflags) \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -54,7 +54,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 compile config.guess config.h.in config.sub configure
rm -f INSTALL depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -67,7 +67,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-dependent files here.
binary-arch: build install
Reply to: