debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit 2377851517a0a2e279dc214585df3ca447ac46c8 Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:49:08 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 95de373..e6bcf33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfonts-base (1:1.0.2) UNRELEASED; urgency=low + + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:47:59 +0000 + xfonts-base (1:1.0.1) unstable; urgency=low [ David Nusinow ] diff --git a/debian/rules b/debian/rules index b9dc929..ea4de74 100755 --- a/debian/rules +++ b/debian/rules @@ -46,14 +46,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 >$@ @@ -70,7 +70,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 @@ -80,7 +80,7 @@ install: build dh_clean -k dh_installdirs for FILE in $(SUBDIRS); do \ - cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \ + cd "$$FILE"-build \ && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install; \ cd ..; \ done -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
