debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit b553cc3b02947a13c2c4346f07468a419b55e898
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:38 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 38c3237..bf2d6df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
+
x11-xkb-utils (7.5+1) unstable; urgency=low
* xkbcomp 1.1.1.
diff --git a/debian/rules b/debian/rules
index a4b078c..8a49f6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,12 +47,12 @@ build-stamp: $(BUILD_STAMPS)
$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
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 $(confflags) \
CFLAGS="$(CFLAGS)"
- cd $*-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd $*-build && $(MAKE)
>$@
clean: xsfclean
@@ -64,7 +64,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
dh_clean
@@ -75,7 +75,7 @@ install: build
dh_installdirs
for FILE in $(SUBDIRS); do \
- cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
DESTDIR=$(CURDIR)/debian/tmp install ; \
+ cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install ; \
cd ..; \
done
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
