[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-vmware: Changes to 'debian-unstable'



 debian/changelog |    7 +++++++
 debian/rules     |   14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 31b699ac0ee5a552b68f0d15da4792af6f915ead
Author: Julien Cristau <jcristau@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 0f3472c..5874801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:10.16.9-2) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:32 +0000
+
 xserver-xorg-video-vmware (1:10.16.9-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 28c48d5..45420c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,18 +36,18 @@ configure:
 	dh_testdir
 	autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/Makefile: configure
+build/Makefile: 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)" 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/Makefile
+build-stamp: build/Makefile
 	dh_testdir
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+	cd build && $(MAKE)
 	>$@
 
 clean: xsfclean
@@ -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 -f $$(find -name Makefile.in)
 	rm -f compile config.guess config.sub configure depcomp install-sh
 	rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
@@ -72,7 +72,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


Reply to: