Merge branch 'master' into full-month-stats

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 31070a6fab176c27605769cf7aa77386f3d30925..885eef76558f36c88353c0ff33300d20bfa54561 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -48,6 +48,7 @@ then
         6) OS=bsd5;;
         7) OS=bsd7;;
         8) OS=bsd7;;
+        9) OS=bsd7;;
         *) OS=unknown;;
     esac
     MAKE="gmake"
@@ -76,7 +77,6 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
-    SHELL="/bin/bash"
 else
     if [ "$OS" = "bsd" ]
     then
@@ -91,7 +91,6 @@ else
             LIB_THREAD=-lc_r
         fi
     fi
-    SHELL="/usr/local/bin/bash"
 fi
 
 if [ -z "$CC" ]
@@ -164,7 +163,6 @@ do
 done
 echo "" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
-echo "SHELL=$SHELL" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "CFLAGS=$CFLAGS" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE