debian/changelog | 7 +++++++
debian/rules | 12 ++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 9aef336b47ed82cf785b258b00cbb848897608df
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:40 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 e20c84d..b195c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-radeonhd (1.3.0-3) 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:17 +0000
+
xserver-xorg-video-radeonhd (1.3.0-2) unstable; urgency=low
* Add ${misc:Depends} to xserver-xorg-video-radeonhd-dbg's Depends.
diff --git a/debian/rules b/debian/rules
index e25c54d..8018b82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,13 +40,13 @@ build-stamp: $(STAMP_DIR)/patch
autoreconf -vfi
- test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ test -d build || mkdir build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--enable-maintainer-mode \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -59,7 +59,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 -rf configure config.guess config.sub config.h.in
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
@@ -72,9 +72,9 @@ 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
install -d -m 755 debian/tmp/usr/bin
- install -m 755 obj-$(DEB_BUILD_GNU_TYPE)/utils/conntest/rhd_conntest
debian/tmp/usr/bin/
+ install -m 755 build/utils/conntest/rhd_conntest debian/tmp/usr/bin/
# Build architecture-dependent files here.
binary-arch: install serverabi
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
