Skip to content

Commit

Permalink
Merge pull request #343 from ddpbsd/makefile-fallout
Browse files Browse the repository at this point in the history
gnu make fallout
  • Loading branch information
cgzones committed Oct 7, 2014
2 parents 8317005 + fd76f20 commit 38a1cff
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,29 @@ Install()

echo "CEXTRA=${CEXTRA}" >> ./src/Config.OS

MAKEBIN=make
## Find make/gmake
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
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"
Expand All @@ -94,7 +110,7 @@ Install()
UpdateStopOSSEC
fi

make PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install
${MAKEBIN} PREFIX=${INSTALLDIR} TARGET=${INSTYPE} install

cd ../

Expand Down

0 comments on commit 38a1cff

Please sign in to comment.