diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-18 15:38:43 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-18 15:38:43 +0100 |
commit | 82162907439d79afa5a8063d66426288ccfb21dc (patch) | |
tree | 6a64678c6a76c8be47e3499bf1b8f13f30ee2ed3 | |
parent | bbba07e5be8cde2a3bee5435072837e1250fe634 (diff) | |
parent | 21e580beb3d7dfb01bd87ea788e3dabd18d012f3 (diff) | |
download | morph-82162907439d79afa5a8063d66426288ccfb21dc.tar.gz |
Merge remote branch 'origin/samthursfield/avoid-double-configure'
Added a missing "export" and reformatted long lines a bit.
-rw-r--r-- | morphlib/buildsystem.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/morphlib/buildsystem.py b/morphlib/buildsystem.py index 3e50b50b..c9f04054 100644 --- a/morphlib/buildsystem.py +++ b/morphlib/buildsystem.py @@ -99,6 +99,7 @@ class AutotoolsBuildSystem(BuildSystem): def __init__(self): self.configure_commands = [ + 'export NOCONFIGURE=1; ' + 'if [ -e autogen.sh ]; then ./autogen.sh; ' + 'elif [ ! -e ./configure ]; then autoreconf -ivf; fi', './configure --prefix="$PREFIX"', |