From 0a6ddd48a0191f5ba1e4a6c121dfafa374ae7722 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 18 Jul 2012 15:51:58 +0200 Subject: [PATCH] build automake packages into multiarch paths and make sure the commands we run don't fail --- auto_debuild.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/auto_debuild.py b/auto_debuild.py index 08a9a79..0db5388 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -35,7 +35,13 @@ def automakeRules(config): r = RulesFile() r.dh += ["--buildsystem=autoconf"] r.rules['auto_configure'] = [ - './configure --build=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --localstatedir=/var ' + + '@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) ' + + '--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) '+ + '--sysconfdir=/etc --localstatedir=/var ' + ' '.join(config.get('automakeParameters', [])) ] r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration -- 2.30.2