debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 82383d25ec821bd51d7a275b96b434260093a44c
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:38 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 69c147d..748b4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xterm (253-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:14 +0000
+
xterm (253-1) unstable; urgency=low
* New upstream release
diff --git a/debian/rules b/debian/rules
index 9f64a9b..d92b017 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,8 @@ CFLAGS += \
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(STAMP_DIR)/patch
dh_testdir
- [ -d obj-$(DEB_BUILD_GNU_TYPE) ] || mkdir obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ [ -d build ] || mkdir build
+ cd build && \
../configure \
--prefix=/usr \
--exec-prefix=/usr \
@@ -74,7 +74,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq.gz
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch $@
.PHONY: clean
@@ -82,7 +82,7 @@ clean: xsfclean
dh_testdir
dh_testroot
rm -rf $(STAMP_DIR)
- rm -rf obj-$(DEB_BUILD_GNU_TYPE)
+ rm -rf build
dh_clean debian/local/xterm.faq.gz
.PHONY: install
@@ -92,7 +92,7 @@ install: build
dh_clean -k
dh_installdirs
# General installation
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ cd build && \
$(MAKE) install mandir=/usr/share/man/man1 libdir=/etc
DESTDIR=$(DEBTREEDIR)
## Install lxterm command and manual page.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
