Merge branch 'master' into full-month-stats

[stg.git] / projects / rlm_stg / build

diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
index dbff7910eb5980edaffbf3f4e874e731468c26b0..0145d0388fd79e7e45326ce4375d597edaa9e711 100755 (executable)
--- a/projects/rlm_stg/build
+++ b/projects/rlm_stg/build
@@ -48,6 +48,7 @@ then
         6) OS=bsd5;;
         7) OS=bsd7;;
         8) OS=bsd7;;
         6) OS=bsd5;;
         7) OS=bsd7;;
         8) OS=bsd7;;

+        9) OS=bsd7;;

         *) OS=unknown;;
     esac
     MAKE="gmake"
         *) OS=unknown;;
     esac
     MAKE="gmake"


@@ -71,7 +72,6 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread

-    SHELL="/bin/bash"

 else
     if [ "$OS" = "bsd" ]
     then
 else
     if [ "$OS" = "bsd" ]
     then


@@ -85,7 +85,6 @@ else
             LIB_THREAD=-lc_r
         fi
     fi
             LIB_THREAD=-lc_r
         fi
     fi

-    SHELL="/usr/local/bin/bash"

     CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"
 fi
 
     CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"
 fi
 


@@ -166,6 +165,5 @@ echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE

-echo "SHELL=$SHELL" >> $CONFFILE

 $MAKE $MAKEOPTS
 
 $MAKE $MAKEOPTS