Merge branch 'master' into full-month-stats

[stg.git] / projects / convertor / build

diff --git a/projects/convertor/build b/projects/convertor/build
index 6d28ba2c26bef5862c8263f5f22e6177af1388f6..c1e2ce786268ccf56b4d6873554a8dd80934115a 100755 (executable)
--- a/projects/convertor/build
+++ b/projects/convertor/build
@@ -65,7 +65,6 @@ PLUGINS="store/files"
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"

-    SHELL="/bin/bash"

     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]
     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]


@@ -81,7 +80,6 @@ else
             LIB_THREAD=-lc_r
         fi
     fi
             LIB_THREAD=-lc_r
         fi
     fi

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

 fi
 
 if [ -z "$CC" ]
 fi
 
 if [ -z "$CC" ]


@@ -273,7 +271,6 @@ do
     echo -n "$plugin " >> $CONFFILE
 done
 echo "" >> $CONFFILE
     echo -n "$plugin " >> $CONFFILE
 done
 echo "" >> $CONFFILE

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

 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "CFLAGS=$CFLAGS" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "CFLAGS=$CFLAGS" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE