diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.stage1 | 1 | ||||
| -rwxr-xr-x | configure | 6 |
3 files changed, 1 insertions, 8 deletions
@@ -66,8 +66,6 @@ # but doesn't care if this build fails. This can be quite surprising, # see in particular the -include in Makefile.stage* -export SHELL:=/bin/bash - # !! Before using FIND_VCS_CLAUSE, please read how you should in the !! # !! FIND_VCS_CLAUSE section of dev/doc/build-system.dev.txt !! export FIND_VCS_CLAUSE:='(' \ diff --git a/Makefile.stage1 b/Makefile.stage1 index c39a6372ef..a60d388fc6 100644 --- a/Makefile.stage1 +++ b/Makefile.stage1 @@ -6,7 +6,6 @@ # # GNU Lesser General Public License Version 2.1 # ####################################################################### -export SHELL:=/bin/bash include Makefile.build # All includes must be declared secondary, otherwise make will delete @@ -339,7 +339,7 @@ if [ "$MAKE" != "" ]; then OK="no" if [ -x ./make ]; then MAKEVERSION=`./make -v | head -1` - if [ "$MAKEVERSION" == "GNU Make 3.81" ]; then OK="yes"; fi + if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi fi if [ $OK = "no" ]; then echo "GNU Make >= 3.81 is needed" @@ -418,10 +418,6 @@ case $ARCH in win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; esac -# this fixes a camlp4 bug under FreeBSD -# ("native-code program cannot do a dynamic load") -if [ `uname -s` = "FreeBSD" ]; then camlp4oexec=$camlp4oexec.byte; fi - CAMLVERSION=`"$bytecamlc" -version` case $CAMLVERSION in |