X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/0a6ddd48a0191f5ba1e4a6c121dfafa374ae7722..6a16ca2114768210c74541b4a882d4a8ecfc1ad6:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 0db5388..0c466b4 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -35,12 +35,11 @@ def automakeRules(config):
 	r = RulesFile()
 	r.dh += ["--buildsystem=autoconf"]
 	r.rules['auto_configure'] = [
-		'@dpkg-architecture -qDEB_BUILD_GNU_TYPE > /dev/null', # make sure this command runs successfully (and hope it does so again)
-		'@dpkg-architecture -qDEB_BUILD_MULTIARCH > /dev/null', # make sure this command runs successfully (and hope it does so again)
-		'./configure --build=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) ' +
+		'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
+		'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+
+			'./configure --build=$$BUILD_TYPE ' +
 			'--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info ' +
-			'--libdir=/usr/lib/$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) '+
-			'--libexecdir=/usr/lib/$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) '+
+			'--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+
 			'--sysconfdir=/etc --localstatedir=/var ' +
 			' '.join(config.get('automakeParameters', []))
 	]
@@ -74,7 +73,7 @@ def createDebianFiles(config):
 	version = config['version']
 	dbgPackage = config.get('dbgPackage', False)
 	packageArchitecture = config.get('architecture', 'any')
-	# we return the list of files generated
+	# we return the list of files generated, so we need to know the architecture
 	arch = getArchitecture(config)
 	files = []
 	# source format file
@@ -136,8 +135,8 @@ def createDebianFiles(config):
 		r.rules['auto_install'] = ['dh_auto_install --destdir=debian/'+binaryName] # install everything into the binary package
 		# for debug packages
 		if dbgPackage:
-			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"]
-			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName]
+			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"] # put debug files in appropriate package
+			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName] # make the doc folder of the dbg package a symlink
 		# dump it to a file
 		r.write(f)
 	mode = os.stat('debian/rules').st_mode