X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/2e0776796423039fa487ed36ee9756abf0f5e28d..1954afc7707460e813e8054741b2259a37a07369:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 410d848..e2258c5 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # auto-debuild - Automatic Generation of Debian Packages
 # Copyright (C) 2012 Ralf Jung <post@ralfj.de>
 #
@@ -105,7 +105,7 @@ class RulesFile:
 		print(file=f)
 		print(".PHONY: build", file=f) # there may be a directory called "build"
 		print(file=f)
-		print("build %:", file=f) # need to mention "build" here again explicitly so PHONY takes effect
+		print("%:", file=f)
 		# write proper dh call
 		dh = self.dh
 		if self.dhWith:
@@ -138,6 +138,7 @@ def automakeRules(r, config):
 	#  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)
 	r.dh += ["--buildsystem=autoconf", "--builddirectory="+config.getstr('buildDir')]
 	r.rules['auto_configure'] = [
+        (safeCall(*config['autogen']) + " && " if 'autogen' in config else '') +
 		safeCall("mkdir", "-p", buildDir),
 		safeCall("cd", buildDir) + " && " +
 		'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
@@ -177,25 +178,23 @@ def commandInBuildEnv(config, command):
 
 def getArchitecture(config):
 	cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])
-	with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
-		res = p.communicate()[0] # get only stdout
-		if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed")
-	return res[0:len(res)-1] # chop of the \n at the end
+	output = subprocess.check_output(cmd)
+	return output.decode('utf-8').strip('\n') # chop off the \n at the end
 
 def writeDependency(f, name, list):
 	if len(list):
 		print(name+": "+', '.join(list), file=f)
 
+# actual work functions
 def deleteDebianFolder():
 	if os.path.islink('debian'):
 		target = os.readlink('debian')
 		if os.path.exists(target):
 			shutil.rmtree(target)
 		os.remove('debian')
-	else:
+	elif os.path.exists('debian'):
 		shutil.rmtree('debian')
 
-# actual work functions
 def createDebianFiles(config):
 	if not isinstance(config, ConfigDict):
 		config = ConfigDict(config)