From 4b61abb37c1928b036ef7ecba046b722435368c2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 27 Jul 2012 14:47:56 +0200 Subject: [PATCH] Fix escaped automake building --- auto_debuild.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/auto_debuild.py b/auto_debuild.py index 422dafb..9252652 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -58,13 +58,13 @@ def automakeRules(config): r.rules['auto_configure'] = [ '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) && '+ - safeCall(['./configure', '--build=$$BUILD_TYPE', - '--prefix=/usr', '--includedir=/usr/include', '--mandir=/usr/share/man', '--infodir=/usr/share/info', - '--libdir=/usr/lib/$$MULTIARCH', '--libexecdir=/usr/lib/$$MULTIARCH', - '--sysconfdir=/etc', '--localstatedir=/var'] + - config.get('automakeParameters', [])) + './configure --build=$$BUILD_TYPE '+ # do the escape manually here so we can use the variables (there's no user-controlled string in here anyway) + '--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info '+ + '--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+ + '--sysconfdir=/etc --localstatedir=/var '+ + safeCall(config.get('automakeParameters', [])) ] - r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration + r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously) return r # utility functions -- 2.30.2