debian/changelog | 7 +++++++
debian/rules | 16 ++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 54f80ef05f7e068cae08369defd69978690f19ba
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:49:10 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 04c341f..bcdf3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.4-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:48:01 +0000
+
xorg-server (2:1.7.4-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index d2efc7a..6d6777d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,10 +127,10 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
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 \
@@ -142,13 +142,13 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
CPPFLAGS="$(CPPFLAGS)"
build: build-stamp tests-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)
>$@
tests-stamp: build-stamp
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) check
+ cd build && $(MAKE) check
>$@
clean: xsfclean
@@ -160,7 +160,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 compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap
rm -f include/do-not-use-config.h.in
@@ -175,7 +175,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
# oh, yuck.
find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
