From 8e536caf014b2fe4a964b2c162aff3015ec73bf1 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@sapphire.(none)>
Date: Wed, 15 Aug 2007 08:38:31 +0000
Subject: [PATCH] 'make -e' won't be enough since we don't export variables

---
 scripts/build.make.none/build.install-make | 18 ++++++++++++++++--
 scripts/build.make.none/build.make         | 16 ++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/scripts/build.make.none/build.install-make b/scripts/build.make.none/build.install-make
index e7a4080..9d868c9 100644
--- a/scripts/build.make.none/build.install-make
+++ b/scripts/build.make.none/build.install-make
@@ -3,8 +3,22 @@ build_target @NAME@
 echo "Installing @NAME@ (via Makefile)"
 export MAKE_OBJDIR="$(pwd)/obj/@NAME@"
 mkdir -p "${MAKE_OBJDIR}"
-do_cmd make -e -C "src/@NAME@/" install
-print_success "Done"
+
+# @TODO@ pass additional flags here
+make -C "src/@NAME@/" install \
+    MAKE_OBJDIR="${MAKE_OBJDIR}" \
+    INSTALL_PREFIX="${INSTALL_PREFIX}" \
+    PREFIX="${PREFIX}" \
+    BINDIR="${BINDIR}" \
+    LIBDIR="${LIBDIR}"
+
+if [ "$?" -eq 0 ]
+then
+    print_success "Done"
+else
+    print_failure "Make failed"
+    exit 1
+fi
 
 # kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.make.none/build.make b/scripts/build.make.none/build.make
index ed2cf13..1102466 100644
--- a/scripts/build.make.none/build.make
+++ b/scripts/build.make.none/build.make
@@ -3,8 +3,20 @@ build_target @NAME@
 echo "Building @NAME@ (via Makefile)"
 export MAKE_OBJDIR="$(pwd)/obj/@NAME@"
 mkdir -p "${MAKE_OBJDIR}"
-do_cmd make -e -C "src/@NAME@/" default
-print_success "Done"
+
+# @TODO@ pass in additional arguments here
+make -C "src/@NAME@/" default \
+    MAKE_OBJDIR="${MAKE_OBJDIR}" \
+    CC="${CC}" \
+    CFLAGS="${CFLAGS}"
+
+if [ "$?" -eq 0 ]
+then
+    print_success "Done"
+else
+    print_failure "Make failed"
+    exit 1
+fi
 
 # kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@