debian/changelog | 4 ++++
debian/rules | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 241bbd71554a65d7ebdbbeacd7921ae87f936b04
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:51 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 e1b0e73..fc46e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ xserver-xorg-video-apm (1:1.2.2-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:05 +0200
xserver-xorg-video-apm (1:1.2.1-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index b130092..e2f2d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,12 +39,12 @@ configure:
build: build-stamp
build-stamp: 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 \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -56,7 +56,7 @@ clean:
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 aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -69,7 +69,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: build install serverabi
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
