From 791e13eb07f58cfa657a6f97de20455a5a044951 Mon Sep 17 00:00:00 2001 From: ddpbsd Date: Tue, 7 Oct 2014 09:59:24 -0400 Subject: [PATCH 1/3] We are not using make, we're using gnu make. Make sure that OpenBSD knows this. --- install.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index c6f66cbda..e88c6350b 100755 --- a/install.sh +++ b/install.sh @@ -76,13 +76,19 @@ Install() echo "CEXTRA=${CEXTRA}" >> ./src/Config.OS + ## Find make/gmake + if [ "X$NUNAME" = "XOpenBSD" ]; then + MAKEBIN=gmake + fi + + # Makefile echo " - ${runningmake}" cd ./src # Binary install will use the previous generated code. if [ "X${USER_BINARYINSTALL}" = "X" ]; then - make PREFIX=${INSTALLDIR} TARGET=${INSTYPE} build + ${MAKEBIN} PREFIX=${INSTALLDIR} TARGET=${INSTYPE} build if [ $? != 0 ]; then cd ../ catError "0x5-build" @@ -94,7 +100,7 @@ Install() UpdateStopOSSEC fi - make PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install + ${MAKEBIN} PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install cd ../ From b83fa893df710319da5b047f9e21fb553be1a922 Mon Sep 17 00:00:00 2001 From: ddpbsd Date: Tue, 7 Oct 2014 10:01:28 -0400 Subject: [PATCH 2/3] Add Net, Free, and Dragonfly BSDs in the gmake dance. --- install.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install.sh b/install.sh index e88c6350b..cd8724ba5 100755 --- a/install.sh +++ b/install.sh @@ -80,6 +80,15 @@ Install() if [ "X$NUNAME" = "XOpenBSD" ]; then MAKEBIN=gmake fi + if [ "X$NUNAME" = "XFreeBSD" ]; then + MAKEBIN=gmake + fi + if [ "X$NUNAME" = "XNetBSD" ]; then + MAKEBIN=gmake + fi + if [ "X$NUNAME" = "XDragonflyBSD" ]; then + MAKEBIN=gmake + fi # Makefile From fd76f204974892b8e730b33a697577df53e0e544 Mon Sep 17 00:00:00 2001 From: ddpbsd Date: Tue, 7 Oct 2014 10:23:00 -0400 Subject: [PATCH 3/3] Reminded by @cgzones that this needs to be set for non-BSD systems as well. --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index cd8724ba5..f9b0a2033 100755 --- a/install.sh +++ b/install.sh @@ -76,6 +76,7 @@ Install() echo "CEXTRA=${CEXTRA}" >> ./src/Config.OS + MAKEBIN=make ## Find make/gmake if [ "X$NUNAME" = "XOpenBSD" ]; then MAKEBIN=gmake