X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/c8125bbd511e6d1c60bfef92e96bd3d485314fff..cb44f55ec0d9f4c20e841a621d69fb727d832db4:/auto_debuild.py diff --git a/auto_debuild.py b/auto_debuild.py index 524603f..640ac4f 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -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