debian/changelog | 2 ++
debian/rules | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit c65889b3de7a2d1762669bc7d7be65814faa9373
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:50 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 ba64ff5..a5b9912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low
* Add hurd-i386 to the Architecture field. Requested by Samuel Thibault.
* Drop references to hal from debian/NEWS, README.Debian and synaptics(4)
(closes: #564549).
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 08 Dec 2009 16:15:58 +0200
diff --git a/debian/rules b/debian/rules
index 3d6de52..37ad494 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,18 +40,18 @@ endif
configure: $(STAMP_DIR)/patch
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -63,7 +63,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
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing aclocal.m4 config.h.in
@@ -76,7 +76,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: DH_OPTIONS=-s
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
