debian/changelog | 2 ++
debian/rules | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit ba5285e2ecfb56b83a0f3b94fa839acd5ec39a9c
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:49:10 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 645add5..6d770bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xfonts-75dpi (1:1.0.1+1) UNRELEASED; urgency=low
* Version the xfonts-utils build-dependency. We need the fontrootdir
variable in fontutil.pc.
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Julien Cristau <jcris...@debian.org> Fri, 01 Jan 2010 15:55:52 +0000
diff --git a/debian/rules b/debian/rules
index f375262..7addbf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,14 +36,14 @@ else
endif
$(STAMP_DIR)/build-%:
- 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)
- $(MAKE) -C $*-obj-$(DEB_BUILD_GNU_TYPE)
+ $(MAKE) -C $*-build
>$@
build: build-stamp
@@ -59,7 +59,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
@@ -69,7 +69,7 @@ install: build
dh_clean -k
dh_installdirs
set -e; for FILE in $(SUBDIRS); do \
- $(MAKE) -C "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE)
DESTDIR=$(CURDIR)/debian/tmp install; \
+ $(MAKE) -C "$$FILE"-build DESTDIR=$(CURDIR)/debian/tmp install;
\
done
install -D -m644 debian/fonts.alias \
debian/tmp/etc/X11/fonts/75dpi/xfonts-75dpi.alias
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
