summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-07-22 20:35:47 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-07-22 20:35:47 +0100
commit5fa84b68ba00474e56c0061878644382b8b48659 (patch)
tree9235e63bef5e8b1f3de9bb9e6126c58e070e1140
parentc297759638ba8b371db19943d98052e761356bec (diff)
downloadliboil-baserock/morph.tar.gz
Real problem is autogen.shbaserock/morph
No need for morphology
-rwxr-xr-xautogen.sh8
-rw-r--r--liboil.morph9
2 files changed, 6 insertions, 11 deletions
diff --git a/autogen.sh b/autogen.sh
index 60a9966..28e74d2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,11 @@ else
confflags="--enable-gtk-doc"
fi
-autoreconf -i -f &&
- ./configure --enable-maintainer-mode --disable-static $confflags $@
+set -e
+
+autoreconf -i -f
+if [ -z "$NOCONFIGURE" ]; then
+ ./configure --enable-maintainer-mode --disable-static $confflags $@
+fi
diff --git a/liboil.morph b/liboil.morph
deleted file mode 100644
index 1a5775a..0000000
--- a/liboil.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "liboil",
- "kind": "chunk",
- "build-system": "autotools",
- "configure-commands": [
- "NOCONFIGURE=1 ./autogen.sh",
- "./configure --prefix=\"$PREFIX\" --disable-gtk-doc"
- ]
-}