debian/changelog | 5 +++++
debian/rules | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit c1ab07389db87d39bca3a70cd0f39a3eb132dc99
Author: Julien Cristau <jcris...@debian.org>
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 c6c6d60..8a6da24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
x11-apps (7.5+2) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Update debian/copyright and package description according
to ico and xedit additions.
* x11pref 1.5.1.
@@ -8,6 +9,10 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
* xeyes 1.1.0.
* xlogo 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 <bgog...@debian.org> Sun, 06 Dec 2009 20:54:44 +0100
x11-apps (7.5+1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 140904f..677a153 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,9 @@ build-stamp: $(BUILD_STAMPS)
>$@
$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
- mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+ mkdir -p $*-build
- cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+ cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--disable-xprint \
@@ -53,7 +53,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts
$(STAMP_DIR)/patch
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
