call $MAKE from configure...

shogun-toolbox · Jul 16, 2012 · 98f4788 · 98f4788
1 parent 6b69c17
commit 98f4788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/examples/undocumented/libshogun/check.sh b/examples/undocumented/libshogun/check.sh
@@ -7,20 +7,21 @@ test -n "$LIB_PATH" && LIB_PATH="LIB_PATH=${LIB_PATH}"
 test -n "$INC_PATH" && INC_PATH="INC_PATH=${INC_PATH}"
 test -n "$LIBS" && LIBS="LIBS=${LIBS}"
 test -n "$INCLUDES" && INCLUDES="INCLUDES=${INCLUDES}"
+test -n "$MAKE" && MAKE="make"
 
-for e in `make print_targets | grep -v ^make`
+for e in `$MAKE print_targets | grep -v ^make`
 do
 	echo -n "running $e .."
-	if make "$e" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" "$INCLUDES" >/dev/null 2>&1 && "./$e" >/dev/null 2>&1
+	if $MAKE "$e" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" "$INCLUDES" >/dev/null 2>&1 && "./$e" >/dev/null 2>&1
 	then
 		echo " OK"
 	else
 		echo " ERROR"
 		echo "================================================================================" >>error.log
-		echo "error in make $e $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS" >>error.log
+		echo "error in $MAKE $e $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS" >>error.log
 		echo "error in ./$e" >>error.log 2>&1
 		echo "================================================================================" >>error.log
-		make "$e" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" >>error.log 2>&1 && "./$e" >>error.log
+		$MAKE "$e" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" >>error.log 2>&1 && "./$e" >>error.log
 		echo "================================================================================" >>error.log
 		echo >>error.log
 		echo >>error.log

diff --git a/src/Makefile.template b/src/Makefile.template
@@ -326,7 +326,7 @@ run-testsuite-libshogun:
 check-examples-libshogun:
 	cd $(CONFIGPATH)/../examples/undocumented/libshogun && $(MAKE) clean && \
 		LIBRARY_PATH="$(LIBRARY_PATH)" LIB_PATH="$(DESTDIR)$(LIBDIR)" \
-		INC_PATH="$(DESTDIR)$(INCDIR)" LIBS="$(LINKFLAGS) -lshogun" $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) INCLUDES="$(INCLUDES)" ./check.sh
+		INC_PATH="$(DESTDIR)$(INCDIR)" LIBS="$(LINKFLAGS) -lshogun" $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) INCLUDES="$(INCLUDES)" MAKE="$(MAKE)" ./check.sh
 
 run-testsuite-elwms:
 	true