From: Ralf Jung <post@ralfj.de>
Date: Wed, 3 Apr 2013 21:14:32 +0000 (+0200)
Subject: Ensure auto_install and auto_configure are always overriden, to ease appending to... 
X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/c7e5d2a705a282e6199c49fa5f6df274701331bc?hp=60e14aacfd2349b4ecc6801194bba8d60a11ff4e

Ensure auto_install and auto_configure are always overriden, to ease appending to them
---

diff --git a/auto_debuild.py b/auto_debuild.py
index f1a3e84..5f1fd3e 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -147,6 +147,7 @@ def automakeRules(r, config):
 
 def makefileRules(r, config):
 	r.dh += ["--buildsystem=makefile"]
+	r.rules['auto_configure'] = []
 
 def noneRules(r, config):
 	r.dh += ["--buildsystem=makefile"] # makefile does the least possible harm
@@ -313,6 +314,7 @@ def createDebianFiles(config):
 		r = RulesFile()
 		r.rules['auto_test'] = []
 		r.rules['auto_install'] = [safeCall('dh_auto_install', '--destdir=debian/'+binaryName)] # install everything into the binary package
+		r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override (we may just append to it later)
 		# patch rule file for build system: may only touch auto_* rules and the dh options
 		buildSystem.ruleMaker(r, config)
 		# global rules
@@ -330,7 +332,6 @@ def createDebianFiles(config):
 		r.rules['builddeb'] = [safeCall('dh_builddeb', "--destdir="+debDir)] # passing this gobally to dh results in weird problems (like stuff being installed there, and not in the package...)
 		# installation rule
 		if 'binarySkipFiles' in config:
-			if not 'auto_install' in r.rules: r.rules['auto_install'] = ['dh_auto_install'] # make sure there is an override
 			r.rules['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " + safeCall('rm', *config.get('binarySkipFiles')))
 		# debug packages
 		if dbgPackage:
@@ -339,7 +340,6 @@ def createDebianFiles(config):
 		r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
 		# wait after configuration?
 		if config.getbool('waitAfterConfig', False):
-			if not 'auto_configure' in r.rules: r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override
 			r.rules['auto_configure'].append("@"+safeCall('read', '-p', 'Configuration done. Hit "Enter" to build the package. ', 'DUMMY_VAR')) # if we run in dash, we need to tell it which variable to use for the result...
 		# dump it to a file
 		r.write(f)