[maemo-commits] [maemo-commits] r9920 - projects/haf/trunk/apt/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-15 19:07:31 +0200 (Thu, 15 Feb 2007)
New Revision: 9920

Modified:
   projects/haf/trunk/apt/debian/rules
Log:
  * Use CXXFLAGS instead of confcxxflags to control compiler options from
    debian/rules.
  * Pass -mthumb to compiler when requested by DEB_BUILD_OPTIONS.
  * Removed locale, cron, debian-archive keyring, man pages and other docs
    from apt package.


Modified: projects/haf/trunk/apt/debian/rules
===================================================================
--- projects/haf/trunk/apt/debian/rules	2007-02-15 16:27:40 UTC (rev 9919)
+++ projects/haf/trunk/apt/debian/rules	2007-02-15 17:07:31 UTC (rev 9920)
@@ -33,6 +33,11 @@
   export CXXFLAGS = -O2 -g -Wall
 endif
 
+# Pass on thumb mode when enabled
+ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -mthumb
+endif
+
 # Default rule
 build:
 
@@ -109,7 +114,7 @@
 	dh_testdir
 	-mkdir build
 	cp COPYING debian/copyright
-	cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
+	cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
 	touch $@
 
 build/build-stamp: build/configure-stamp
@@ -206,18 +211,18 @@
 	cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/
 
 	cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
-	cp -r $(BLD)/locale debian/$@/usr/share/
+	#cp -r $(BLD)/locale debian/$@/usr/share/
 
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
-	cp share/debian-archive.gpg debian/$@/usr/share/$@
+#	cp share/debian-archive.gpg debian/$@/usr/share/$@
 
 #	head -n 500 ChangeLog > debian/ChangeLog
 
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
-	dh_installman -p$@ 
-	dh_installcron -p$@
-	dh_installdocs -p$@
+#	dh_installman -p$@ 
+#	dh_installcron -p$@
+#	dh_installdocs -p$@
 	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@