x11-utils: Changes to 'debian-unstable'
debian/changelog | 5 +++++
debian/rules | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit da0bdf17bc392faf454c83ca842b7a1d44636741
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:36 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 1603b88..1e3055f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
x11-utils (7.5+2) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* listres 1.0.2.
* viewres 1.0.2.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Brice Goglin <bgoglin@debian.org> Sun, 20 Dec 2009 09:46:39 +0100
x11-utils (7.5+1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 17713d7..74397b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,15 +45,15 @@ 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) \
--disable-xprint \
CFLAGS="$(CFLAGS)" \
RSH=rsh \
MANCONF="/etc/manpath.config"
- cd $*-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd $*-build && $(MAKE)
>$@
clean: xsfclean
@@ -65,7 +65,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
@@ -76,7 +76,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: