[MPlayer-cvslog] r31944 - in trunk: README debian/rules

[siretart]

Author: siretart
Date: Sat Aug  7 20:23:31 2010
New Revision: 31944

Log:
restore functionality to be able to pass custom configure flags or override the used compiler

Modified:
   trunk/README
   trunk/debian/rules

Modified: trunk/README
==============================================================================
--- trunk/README	Sat Aug  7 20:10:15 2010	(r31943)
+++ trunk/README	Sat Aug  7 20:23:31 2010	(r31944)
@@ -135,8 +135,12 @@ NOTE: If you run Debian you can configur
 
   debian/daily-build.sh -b
 
-If you want to modify options to configure, please adjust the file
-debian/rules to your needs.
+You can also pass some variables to the Makefile. For example, if you
+want to compile with gcc 3.4 even if it's not the default compiler, or
+pass extra configure options you would use:
+
+  CC=gcc-3.4 DEB_EXTRA_CONFIGURE_FLAGS="--disable-libdvdcss-internal" debian/daily-build.sh -b
+
 
 To clean up the source tree run the following command:
 

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	Sat Aug  7 20:10:15 2010	(r31943)
+++ trunk/debian/rules	Sat Aug  7 20:23:31 2010	(r31944)
@@ -83,9 +83,9 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
     CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
 endif
 
-# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and
-# https://wiki.ubuntu.com/DistCompilerFlags
-CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
+ifneq (,$(DEB_EXTRA_CONFIGURE_FLAGS))
+    CONFIGURE_FLAGS += $(DEB_EXTRA_CONFIGURE_FLAGS)
+endif
 
 build: build-arch build-indep