r356 - packages/boson/boson-base/trunk/debian

[Reinhard Tartler]

Author: siretart-guest
Date: 2006-03-25 15:31:14 +0000 (Sat, 25 Mar 2006)
New Revision: 356

Modified:
   packages/boson/boson-base/trunk/debian/rules
Log:
call configure correctly, as advised in /usr/share/doc/autotools-dev/README.Debian,
remove some leftover from upstream makefiles



Modified: packages/boson/boson-base/trunk/debian/rules
===================================================================
--- packages/boson/boson-base/trunk/debian/rules	2006-03-25 00:04:59 UTC (rev 355)
+++ packages/boson/boson-base/trunk/debian/rules	2006-03-25 15:31:14 UTC (rev 356)
@@ -15,9 +15,16 @@
 
 objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 
+# taken from /usr/share/doc/autotools-dev/README.Debian
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags = --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
-	CONFIGURE_FLAG = --enable-debug=full
+	confflags += --enable-debug=full
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -46,14 +53,9 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-	#
-	#if [ -f Makefile.cvs ]; then \
-	#	make -f Makefile.cvs; \
-	#fi
 
  	# run configure with build tree $(objdir)
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) $(CONFIGURE_FLAG) --enable-final
+	./configure $(configkde) $(confflags) --enable-final
 
 	touch configure-stamp
 
@@ -81,6 +83,10 @@
 		make distclean; \
 	fi
 
+	# leftovers from upstream Makefiles
+	rm -rf boson/tests/.deps boson/tests/Makefile
+
+	# leftovers from packaging
 	rm -f debian/files debian/boson-base.substvars \
 	debian/boson.6 \
 	debian/bo3dsdebug.6 \
@@ -96,7 +102,7 @@
 	debian/boufodesigner.6 \
 	debian/bouic.6 \
 	debian/bounit.6 \
-	config.log
+	config.log 
 
 	dh_clean