Applied patches from BSD/pkgsrc maintainer, so that Coq compiles out-of-the-box.

- Removed unneeded bashisms. (sh and dash are fine with the current build system.)
- Removed workaround for camlp4.opt on BSD.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12362 85f007b7-540e-0410-9357-904b9bb8a0f7

3 files changed, 1 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 858ee8e6d3..d71ad208b4 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/configure b/configure
index 9daba918cc..245cf2b1ab 100755
--- a/configure
+++ b/configure
@@ -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