debian/changelog | 2 ++
debian/rules | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit c234c04b0c7cef640ef19fc7e08ed9e96fb9a7dc
Author: Julien Cristau <jcris...@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 58d9b09..e404e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libxaw (2:1.0.7-2) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 16:52:09 +0100
diff --git a/debian/rules b/debian/rules
index cdd6db5..16f3fef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,9 @@ endif
configure: $(STAMP_DIR)/patch
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 \
--infodir=\$${prefix}/share/info $(confflags) \
--disable-xaw6 --disable-xaw8 \
@@ -42,10 +42,10 @@ 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
@@ -58,7 +58,7 @@ clean: xsfclean
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
@@ -71,7 +71,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
# the generated html looks ugly, don't ship it
rm -f debian/tmp/usr/share/doc/libXaw/widgets.html
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
