[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xfonts-100dpi: Changes to 'debian-unstable'



 debian/changelog |    7 +++++++
 debian/rules     |   10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit e049f89df1bf5577a86ebd94f1cf5b803aaa379d
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 faa49aa..f069a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-100dpi (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 <jcristau@debian.org>  Sat, 16 Jan 2010 16:48:00 +0000
+
 xfonts-100dpi (1:1.0.1) unstable; urgency=low
 
   * New upstream releases for X11R7.5:
diff --git a/debian/rules b/debian/rules
index f780810..d6e892b 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/100dpi/xfonts-100dpi.alias


Reply to: