Commit 56b900c0 authored by Rafaël Carré's avatar Rafaël Carré Committed by Rémi Denis-Courmont

Simplify MAKE detection and ./compile creation

Clarify what ./compile does
(cherry picked from commit 468e5ea3)
parent efe42251
......@@ -4306,21 +4306,27 @@ dnl Generate makefiles
AC_OUTPUT
dnl Do we have to use make or gmake ?
USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
if make --version 2>&1|grep -q GNU
then
# GNU make, all seems good
MAKE=make
else
# Known GNU make alias (on BSD)
MAKE=gmake
fi
dnl Shortcut to nice compile message
rm -f compile
if test -n $SHELL; then
SHELL=${CONFIG_SHELL-/bin/sh}
fi
echo '#! '$SHELL >compile
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
echo "($USE_MAKE_OR_GMAKE V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile
echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile
echo test -f .error\$\$ \&\& ERROR=1 >>compile
echo rm -f .error\$\$ >>compile
echo exit \$ERROR >>compile
rm -f compile
echo "#! $SHELL
rm -f .error\$\$
ERROR=0
export PATH=\"$PATH\" LANG=C
($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl
test -f .error\$\$ \&\& ERROR=1
rm -f .error\$\$
exit \$ERROR" >compile
chmod a+x compile
echo "
......@@ -4336,4 +4342,4 @@ else
echo "build vlc executable : no"
fi
echo "
To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'."
To build vlc and its plugins, type \`$MAKE', or \`./compile' if you like nice colors."
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment