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

libxdmcp: Changes to 'debian-unstable'



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

New commits:
commit 559be587b7d41aaad48e6bb16d07dd7c6253ac5d
Author: Julien Cristau <julien@radis.liafa.jussieu.fr>
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 4fa355d..50bfec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxdmcp (1:1.0.3-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:34 +0000
+
 libxdmcp (1:1.0.3-1) unstable; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/rules b/debian/rules
index 523de2d..96d0824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,13 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 	autoreconf -vfi
-	mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-	cp Wraphelp.c obj-$(DEB_BUILD_GNU_TYPE) #Ick... to allow des building
-	cd obj-$(DEB_BUILD_GNU_TYPE) && \
+	mkdir -p build
+	cp Wraphelp.c build #Ick... to allow des building
+	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:
@@ -55,7 +55,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.h.in config.sub configure
 	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
 	find -name Makefile.in -delete
@@ -68,7 +68,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


Reply to: