Fix service reloading on SIGHUP (thanks, Sebastien!)

[catta] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f0eedcd6c0737b6f62f96c819222788895012cab..d24de757efb015e99afb7984b12a0b41f95397cb 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+VERSION=1.9
+
 run_versioned() {
     local P
     type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
@@ -28,7 +30,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -36,13 +38,13 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
+    run_versioned aclocal "$VERSION" -I common
     libtoolize -c --force
     autoheader
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     autoconf -Wall
 
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
+    CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
 
     make clean
 fi