r9814 - in /desktop/experimental/totem/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 12 13:27:24 2007
New Revision: 9814

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9814
Log:
* Honor CFLAGS we set in rules, doh!

Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/rules

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=9814&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Thu Apr 12 13:27:24 2007
@@ -1,3 +1,9 @@
+totem (2.18.1-2) UNRELEASED; urgency=low
+
+  * Honor CFLAGS we set in rules, doh!
+
+ -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 15:26:41 +0200
+
 totem (2.18.1-1) experimental; urgency=low
 
   * Include the new check-dist Makefile to prevent accidental uploads to

Modified: desktop/experimental/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/rules?rev=9814&op=diff
==============================================================================
--- desktop/experimental/totem/debian/rules (original)
+++ desktop/experimental/totem/debian/rules Thu Apr 12 13:27:24 2007
@@ -11,7 +11,9 @@
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# how to call make, similar to CDBS
+# how to call configure and make, similar to CDBS
+DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="$(CFLAGS)"
+DEB_CONFIGURE_INVOKE = $(DEB_CONFIGURE_SCRIPT_ENV) ./configure
 DEB_MAKE_ENVVARS += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE)
 
@@ -41,7 +43,7 @@
 	  $(DEB_MAKE_INVOKE) distclean; \
 	  rm -f build-gstreamer-stamp; \
 	fi
-	./configure $(COMMON_CONFIGURE_FLAGS) --enable-xine
+	$(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS) --enable-xine
 	$(DEB_MAKE_INVOKE)
 	touch $@
 
@@ -52,7 +54,7 @@
 	  $(DEB_MAKE_INVOKE) distclean; \
 	  rm -f build-xine-stamp; \
 	fi
-	./configure $(COMMON_CONFIGURE_FLAGS)
+	$(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS)
 	$(DEB_MAKE_INVOKE)
 	touch $@