Commit 468e5ea3 authored by Rafaël Carré's avatar Rafaël Carré

Simplify MAKE detection and ./compile creation

Clarify what ./compile does
parent 9266718f
...@@ -4233,21 +4233,27 @@ dnl Generate makefiles ...@@ -4233,21 +4233,27 @@ dnl Generate makefiles
AC_OUTPUT AC_OUTPUT
dnl Do we have to use make or gmake ? 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 dnl Shortcut to nice compile message
rm -f compile
if test -n $SHELL; then if test -n $SHELL; then
SHELL=${CONFIG_SHELL-/bin/sh} SHELL=${CONFIG_SHELL-/bin/sh}
fi fi
echo '#! '$SHELL >compile rm -f compile
echo rm -f .error\$\$ >>compile echo "#! $SHELL
echo ERROR=0 >>compile rm -f .error\$\$
echo export PATH=$PATH LANG=C >>compile ERROR=0
echo "($USE_MAKE_OR_GMAKE V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile export PATH=\"$PATH\" LANG=C
echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile ($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl
echo test -f .error\$\$ \&\& ERROR=1 >>compile test -f .error\$\$ \&\& ERROR=1
echo rm -f .error\$\$ >>compile rm -f .error\$\$
echo exit \$ERROR >>compile exit \$ERROR" >compile
chmod a+x compile chmod a+x compile
echo " echo "
...@@ -4263,4 +4269,4 @@ else ...@@ -4263,4 +4269,4 @@ else
echo "build vlc executable : no" echo "build vlc executable : no"
fi fi
echo " 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