xfonts-utils: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit e6c6827834a201bd83b82a62747a05139031faba
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:49:09 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 5ac4bb9..838730c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:7.5+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:59 +0000
+
xfonts-utils (1:7.5+2) unstable; urgency=low
[ Theppitak Karoonboonyanan ]
diff --git a/debian/rules b/debian/rules
index a4a71ff..8f9ef68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,13 +43,13 @@ build-stamp: $(STAMP_DIR)/genscripts $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
$(STAMP_DIR)/build-%: $(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) \
--with-mapdir=\$${prefix}/share/fonts/X11/util \
CFLAGS="$(CFLAGS)" CPPFLAGS="-D_GNU_SOURCE"
- cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+ cd $*-build && \
$(MAKE)
>$@
@@ -62,7 +62,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
@@ -73,7 +73,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
Reply to: