--- tools/Compile/bin/Compile	2007-01-30 22:46:21.000000000 +0100
+++ MyTools/Compile/bin/Compile	2007-01-30 23:46:52.000000000 +0100
@@ -63,7 +63,6 @@
 else sudo="sudo -u #0"
 fi
 
-make="${compileMakeCommand:-ColorMake}"
 chown="${compileChownCommand:-chown}"
 
 # Options to be propagated in sub-calls to Compile
@@ -619,6 +618,14 @@
    done
 fi
 
+# Set up make tool
+if [ ! ${make} ]; then
+	make="${compileMakeCommand:-ColorMake}"
+fi
+
+# Set up make -f flag
+[ ! -z ${makefile} ] && makefile_arg=" -f ${makefile}" || makefile_arg=""
+
 ##################################################
 # Check recipe's Compile version
 ##################################################
@@ -981,7 +988,7 @@
       ) || exit 1
    fi
    if ! [ "$do_build" = "no" ]
-   then $make $build_target "${buildmerged[@]}" -f $makefile || wrap_fail "Build process failed."
+   then $make $build_target "${buildmerged[@]}" ${makefile_arg} || wrap_fail "Build process failed."
    fi
    Boolean "no-install" && exit
    build_tree_if "$create_dirs_first" != "yes"
@@ -1149,7 +1156,7 @@
    if ! [ "$do_build" = "no" ]
    then
       is_function_set pre_build && pre_build
-      $make $build_target "${buildmerged[@]}" -f $makefile || wrap_fail "Build failed."
+      $make $build_target "${buildmerged[@]}" ${makefile_arg} || wrap_fail "Build failed."
    fi
    Boolean "no-install" && exit
    build_tree_if "$create_dirs_first" != "yes"