debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 1c46d97d2b92f1ae12ae608a947371b84aacf1db
Author: Julien Cristau <jul...@radis.liafa.jussieu.fr>
Date: Sat Jan 16 16:48:37 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 6d42889..f25bc8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-session-utils (7.5+2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:12 +0000
+
x11-session-utils (7.5+1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 49a0966..217c1e6 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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
