Don't pass --prefix to DISTCHECK_CONFIGURE_FLAGS. It interferes with automake.

[autobuild.git] / src / main.bash

diff --git a/src/main.bash b/src/main.bash
index 0e902119b1fde6af02286913d3105d39de8a9033..73dc7cb3aeee6a61c157b4ac136324194192971c 100644 (file)
--- a/src/main.bash
+++ b/src/main.bash
@@ -1,5 +1,5 @@
 function runMake () {
-    run gmake -w -j $(detectNumCPUs) $@
+    run gmake -w -j $(detectNumCPUs) "$@"
 }
 
 function configure () {
@@ -15,7 +15,7 @@ function configure () {
     if [[ ! -f "_build/Makefile" ]]; then
         run mkdir -p _build
         run pushd _build
-        run ../configure "${configArgs[@]}"
+        run ../configure --prefix="$prefix" "${configArgs[@]}"
         run popd
     fi
 }
@@ -46,12 +46,12 @@ function dist () {
 
 function distcheck () {
     configure
-    runMake -C "_build" distcheck
+    runMake -C "_build" distcheck DISTCHECK_CONFIGURE_FLAGS="${configArgs[*]}"
 }
 
 function install () {
     build
-    runMake -C "_build" install "$0"
+    runMake -C "_build" install "$@"
 }
 
 function usage () {
@@ -60,7 +60,7 @@ Usage: $0 [COMMAND]
 
 This is an automation script designed to work with autotools. It creates a
 directory "./_build" and builds any files inside it. Its behaviour is
-somewhat configurable: see "./Build.rc" for details.
+somewhat configurable: See "./Build.rc" for details.
 
 If no COMMAND is given, it defaults to "build".