--- stg/projects/convertor/build.orig	2010-04-14 11:58:43 +0300

+++ stg/projects/convertor/build	2010-08-17 14:00:51 +0300

@@ -17,8 +17,8 @@ OWNER=root

 VAR_DIR="./inst/var/stargazer"

 DEFS="-DDEBUG"

 MAKEOPTS="-j1"

-CXXFLAGS="$CXXFLAGS -g3 -W -Wall -I/usr/local/include"

-LDFLAGS="$LDFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -g3 -W -Wall -I/usr/include"

+LDFLAGS="$LDFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -80,12 +80,12 @@ else

             LIB_THREAD=-lc_r

         fi

     fi

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "

 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c

-gcc $CXXFLAGS $LDFLAGS -L/usr/lib/mysql -L/usr/local/lib/mysql build_check.c -o fake > /dev/null 2> /dev/null

+gcc $CXXFLAGS $LDFLAGS -L/usr/lib/mysql build_check.c -o fake > /dev/null 2> /dev/null

 if [ $? != 0 ]

 then

     echo "FAIL!"

--- stg/projects/rlm_stg/build.orig	2010-04-14 11:58:44 +0300

+++ stg/projects/rlm_stg/build	2010-08-17 14:00:18 +0300

@@ -28,8 +28,8 @@ else

     fi

 fi

-CXXFLAGS="$CXXFLAGS -I/usr/local/include"

-LDFLAGS="$LDFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -I/usr/include"

+LDFLAGS="$LDFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -83,7 +83,7 @@ else

             LIB_THREAD=-lc_r

         fi

     fi

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "

--- stg/projects/rscriptd/build.orig	2010-04-14 11:58:52 +0300

+++ stg/projects/rscriptd/build	2010-08-17 13:59:57 +0300

@@ -29,8 +29,8 @@ else

     fi

 fi

-CXXFLAGS="$CXXFLAGS -I/usr/local/include"

-LDFLAGS="$LDFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -I/usr/include"

+LDFLAGS="$LDFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -90,7 +90,7 @@ else

             LIB_THREAD=-lc_r

         fi

     fi

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "

--- stg/projects/sgauth/build.orig	2010-04-14 11:59:02 +0300

+++ stg/projects/sgauth/build	2010-08-17 13:59:38 +0300

@@ -29,8 +29,8 @@ else

     fi

 fi

-CXXFLAGS="$CXXFLAGS -I/usr/local/include"

-LDFLAGS="$CXXFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -I/usr/include"

+LDFLAGS="$CXXFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -89,7 +89,7 @@ else

             LIB_THREAD=-lc_r

         fi

     fi

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "

--- stg/projects/sgconf/build.orig	2010-04-14 11:59:11 +0300

+++ stg/projects/sgconf/build	2010-08-17 13:59:13 +0300

@@ -29,8 +29,8 @@ else

     fi

 fi

-CXXFLAGS="$CXXFLAGS -I/usr/local/include"

-LDFLAGS="$LDFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -I/usr/include"

+LDFLAGS="$LDFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -87,7 +87,7 @@ else

             LIB_THREAD=-lc_r

         fi

     fi

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "

--- stg/projects/stargazer/build.orig	2010-05-09 15:39:01 +0300

+++ stg/projects/stargazer/build	2010-08-17 13:58:52 +0300

@@ -71,8 +71,8 @@ else

     fi

 fi

-CXXFLAGS="$CXXFLAGS -I/usr/local/include"

-LDFLAGS="$LDFLAGS -L/usr/local/lib"

+CXXFLAGS="$CXXFLAGS -I/usr/include"

+LDFLAGS="$LDFLAGS -L/usr/lib"

 if [ "$sys" = "Linux" ]

 then

@@ -152,7 +152,7 @@ else

     PLUGINS="$PLUGINS

              capture/ether_freebsd

              capture/divert_freebsd"

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

+    SHELL="/usr/bin/bash"

 fi

 echo -n "Checking endianess... "