[SCM] ffmpeg/master: Avoid needlessly re-running configure

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a2e5d1b769a081e58d475a832bbe879911b04a5
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Oct 30 10:01:32 2016 +0100

    Avoid needlessly re-running configure

diff --git a/debian/rules b/debian/rules
index 25460e0..5ca733a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -199,6 +199,7 @@ endif
 override_dh_auto_configure:
 	$(foreach flavor,$(FLAVORS),mkdir -p debian/$(flavor);)
 	$(foreach flavor,$(FLAVORS),set -e; echo " *** $(flavor) ***"; cd debian/$(flavor); ../../configure $(CONFIG) $(CONFIG_$(flavor)) || (cat config.log && exit 1); cd ../.. ;)
+	touch override_dh_auto_configure
 
 # Remove the subdirectories generated for the flavors.
 override_dh_auto_clean:
@@ -209,6 +210,7 @@ override_dh_auto_build-indep:
 	dh_auto_build -i --sourcedirectory=debian/standard -- apidoc
 	# Create the minified CSS files.
 	lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > debian/standard/doc/style.min.css
+	rm override_dh_auto_configure
 
 override_dh_auto_build-arch:
 	# Copy built object files to avoid building them again for the extra flavor.

-- 
ffmpeg packaging