From bd58d7bd96a35805e9e55a520250fcb369633d97 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 13 Nov 2012 10:22:37 +0000 Subject: Revert "Merge remote-tracking branch 'origin/jonathanmaw/autotools-sysconfdir'" cmake has a ./configure, which accepts --prefix, but chokes on --sysconfdir This means that bootstrap is broken by this commit. This reverts commit 5f22ded9711a047704fc91b68a182b057e29bc0f, reversing changes made to e13753d4f3e26f3a4c705fb3e694ae8dea860c2d. --- morphlib/buildsystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'morphlib/buildsystem.py') diff --git a/morphlib/buildsystem.py b/morphlib/buildsystem.py index 98aa2219..6287063a 100644 --- a/morphlib/buildsystem.py +++ b/morphlib/buildsystem.py @@ -103,7 +103,7 @@ class AutotoolsBuildSystem(BuildSystem): 'if [ -e autogen ]; then ./autogen; ' + 'elif [ -e autogen.sh ]; then ./autogen.sh; ' + 'elif [ ! -e ./configure ]; then autoreconf -ivf; fi', - './configure --prefix="$PREFIX" --sysconfdir=/etc', + './configure --prefix="$PREFIX"', ] self.build_commands = [ 'make', -- cgit v1.2.1