r10010 - in /desktop/unstable/gnome-utils/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr 16 09:07:48 2007
New Revision: 10010

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10010
Log:
* Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
  differ.
* Cleanups.

Modified:
    desktop/unstable/gnome-utils/debian/changelog
    desktop/unstable/gnome-utils/debian/rules

Modified: desktop/unstable/gnome-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/changelog?rev=10010&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/changelog (original)
+++ desktop/unstable/gnome-utils/debian/changelog Mon Apr 16 09:07:48 2007
@@ -6,8 +6,11 @@
     closes: #419256.
   * Upload to unstable; drop check-dist include.
   * Wrap build-deps and deps.
-
- -- Loic Minier <lool at dooz.org>  Mon, 16 Apr 2007 11:01:35 +0200
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 16 Apr 2007 11:05:55 +0200
 
 gnome-utils (2.18.0-1) experimental; urgency=low
 

Modified: desktop/unstable/gnome-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/rules?rev=10010&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/rules (original)
+++ desktop/unstable/gnome-utils/debian/rules Mon Apr 16 09:07:48 2007
@@ -1,78 +1,71 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Modified for gnome-utils by Joe Drew, 2002.
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS += -Wall -g
+configure_flags += \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--sysconfdir=/etc \
+		--libexecdir=\$${prefix}/lib/gnome-utils \
+		--enable-ipv6=yes \
+		--disable-scrollkeeper \
+		--enable-gfloppy \
+		--build=$(DEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
 config.status: configure
 	dh_testdir
-
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${prefix}/lib/gnome-utils --enable-ipv6=yes --disable-scrollkeeper --enable-gfloppy
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
-
-#	Change DTD URL in documentation to the one on the local system,
-#	so the DTD is not fetched off the network
+	# Change DTD URL in documentation to the one on the local system, so
+	# the DTD is not fetched off the network
 	find -name "*.xml" -print0 | xargs -0 perl -i -pe 's/http:\/\/www.oasis-open.org\/docbook\/xml\/4.1.2\/docbookx.dtd/\/usr\/share\/sgml\/docbook\/dtd\/xml\/4.1.2\/docbookx.dtd/'
-
 	$(MAKE)
-
 	touch build-stamp
-
 
 clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
 	-$(MAKE) distclean
 	-test -r /usr/share/misc/config.sub && test -r config.sub && \
 		cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && test -r config.guess && \
 		cp -f /usr/share/misc/config.guess config.guess
-
-
 	rm -f po/.intltool-merge-cache
 	rm -f intltool-extract intltool-merge intltool-update
 	find . -name "*.omf.out" -exec rm -f {} \;
-
 	dh_clean
-
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/gnome-utils prefix=$(DESTDIR)/usr
-#	Remove scrollkeeper generated files. Re-created in postinst
-#	on user's system
+	# Remove scrollkeeper generated files. Re-created in postinst on user's
+	# system
 	-rm -rf $(CURDIR)/debian/gnome-utils/usr/var
 	# drop development files for libgdict
 	rm -rf debian/gnome-utils/usr/lib/libgdict-1.0.so
 	rm -rf debian/gnome-utils/usr/lib/libgdict-1.0.la
 
 binary-indep: build install
-# We have nothing to do by default.
 
 binary-arch: build install
 	dh_testdir