r9910 - in /desktop/unstable/pyorbit/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Apr 14 10:06:50 2007
New Revision: 9910

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9910
Log:
* Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals
  DEB_HOST_GNU_TYPE; cleanups.

Modified:
    desktop/unstable/pyorbit/debian/changelog
    desktop/unstable/pyorbit/debian/rules

Modified: desktop/unstable/pyorbit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/changelog?rev=9910&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/changelog (original)
+++ desktop/unstable/pyorbit/debian/changelog Sat Apr 14 10:06:50 2007
@@ -6,8 +6,10 @@
   * Wrap build-deps and deps.
   * Fix URL in copyright.
   * Add XB/XS-Python-Version.
+  * Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals
+    DEB_HOST_GNU_TYPE; cleanups.
 
- -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 11:36:10 +0200
+ -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 12:06:25 +0200
 
 pyorbit (2.14.2-1) experimental; urgency=high
 

Modified: desktop/unstable/pyorbit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/rules?rev=9910&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/rules (original)
+++ desktop/unstable/pyorbit/debian/rules Sat Apr 14 10:06:50 2007
@@ -1,33 +1,26 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 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)
+configure_flags += --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE)
+
 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
-
-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
 
-PYVERS=$(shell pyversions -vr debian/control 2>/dev/null)
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+PYVERS := $(shell pyversions -vr debian/control 2>/dev/null)
 
 build-%/configure-stamp: configure
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
 		PYTHON=`which python$*` CFLAGS="$(CFLAGS)" \
-			$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) \
-				--build=$(DEB_BUILD_GNU_TYPE) \
-				--prefix=/usr
+			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp
@@ -57,9 +50,6 @@
 	-test -f config.sub && cp -f /usr/share/misc/config.guess config.guess
 	dh_clean
 
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
@@ -77,7 +67,6 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot