Merge pull request #125 from djs55/allow-older-ocaml

Makefile: don't automatically run configure
xapi-project · Aug 24, 2014 · be9ea20 · be9ea20
2 parents 968f690 + db1a0f5
commit be9ea20
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,7 +46,6 @@ xenopsd-xc
 config.mk
 dist
 _build
-configure
 setup.bin
 setup.data
 scripts/vif

diff --git a/Makefile b/Makefile
@@ -13,12 +13,9 @@ clean:
 
 -include config.mk
 
-config.mk: configure
-	./configure
-
-configure: configure.ml
-	ocamlfind ocamlc -linkpkg -package findlib,cmdliner -o configure configure.ml
-	@rm -f configure.cm*
+config.mk:
+	echo Please re-run configure
+	exit 1
 
 setup.bin: setup.ml
 	@ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<

diff --git a/configure b/configure
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+D=$(mktemp -d)
+function cleanup {
+  cd /
+  rm -rf $D
+}
+trap cleanup EXIT
+
+cp configure.ml $D
+(cd $D; ocamlfind ocamlopt -package "cmdliner,findlib,unix" -linkpkg configure.ml -o configure)
+$D/configure $*