r5318 - packages/trunk/funguloids/debian

[Andres Mejia]

Author: ceros-guest
Date: 2008-01-13 03:13:59 +0000 (Sun, 13 Jan 2008)
New Revision: 5318

Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/rules
Log:
Calling GNU configure properly (as described in autotools-dev documentation.

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2008-01-13 03:09:50 UTC (rev 5317)
+++ packages/trunk/funguloids/debian/changelog	2008-01-13 03:13:59 UTC (rev 5318)
@@ -26,6 +26,7 @@
     + Adding option to use noopt.
     + Adding proper CXXFLAGS.
     + Adding option to use nostrip.
+    + Calling GNU configure properly (from autotools-dev documentation).
 
  -- Andres Mejia <mcitadel at gmail.com>  Sat, 12 Jan 2008 00:46:39 -0500
 

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2008-01-13 03:09:50 UTC (rev 5317)
+++ packages/trunk/funguloids/debian/rules	2008-01-13 03:13:59 UTC (rev 5318)
@@ -4,18 +4,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# These are from the autotools-dev package documentation.
+# /usr/share/doc/autotools-dev/README.Debian.gz
+# from the section titled "Calling GNU configure properly"
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+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
+
+# Specify available DEB_BUILD_OPTIONS
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-   CXXFLAGS += -O0 -g -Wall
+  CXXFLAGS += -O0 -g -Wall
 else
-   CXXFLAGS += -O2 -g -Wall
+  CXXFLAGS += -O2 -g -Wall
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   DONT_STRIP = true
+  DONT_STRIP = true
 endif
 
 patch: patch-stamp
@@ -32,7 +41,7 @@
 	automake --add-missing --force-missing --copy && \
 	autoconf -f && \
 	CXX=$(DEB_HOST_GNU_TYPE)-g++ CXXFLAGS="$(CXXFLAGS)" \
-		./configure --prefix=/usr --with-fmod=no
+		./configure $(confflags) --prefix=/usr --with-fmod=no
 	touch configure-stamp
 
 build: configure build-stamp