Fix escaped automake building

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index efc36ebb52a8b6c2d39125b528e0b5769cb34b81..9252652ad246fd82a0c830d0f6f0c0374fcd0051 100755 (executable)
--- 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) && '+
        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) && '+

-                       './configure --build=$$BUILD_TYPE ' +
-                       '--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info ' +
+                       './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 '+
                        '--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+

-                       '--sysconfdir=/etc --localstatedir=/var ' +
-                       ' '.join(config.get('automakeParameters', []))
+                       '--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
        return r
 
 # utility functions


@@ -165,8 +165,8 @@ def createDebianFiles(config):
                r.rules['auto_install'] = [safeCall(['dh_auto_install', '--destdir=debian/'+binaryName])] # install everything into the binary package
                # for debug packages
                if dbgPackage:
                r.rules['auto_install'] = [safeCall(['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"] # put debug files in appropriate package
-                       r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName] # make the doc folder of the dbg package a symlink
+                       r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package
+                       r.rules['installdocs'] = [safeCall(['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
                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode