fix install scripts.

diff --git a/ChangeLog b/ChangeLog
index 2a45c5b70a27357362039b0c01385967c4d17024..b3ef57a3314b0e7e00bfd1cc497652ae631d2b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
+2013/4/25 release 2.1
+
 2013/2/7
-       * fix stop behavior
+       * fix behavior of stop to wait until process disappeared
        * add parameters: pgpoolcmd, psqlcmd, pcpnccmd
 
 2012/12/25

diff --git a/Makefile.in b/Makefile.in
index 168902c8523276f385abdc002362bb68327d7b75..806b973af257ec99927e7363a06c624772658440 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,9 +24,9 @@ distclean:
        rm -f pgpool Makefile config.log
 
 dist:
-       cp -R . /tmp/pgpool-ha-2.0
-       mv /tmp/pgpool-ha-2.0 .
-       ( cd pgpool-ha-2.0 ; make distclean ; cd .. )
-       tar cjf pgpool-ha-2.0.tar.bz2 --exclude-vcs pgpool-ha-2.0
-       rm -rf pgpool-ha-2.0
+       cp -R . /tmp/pgpool-ha-@VERSION@
+       mv /tmp/pgpool-ha-@VERSION@ .
+       ( cd pgpool-ha-@VERSION@ ; make distclean ; cd .. )
+       tar cjf pgpool-ha-@VERSION@.tar.bz2 --exclude-vcs pgpool-ha-@VERSION@
+       rm -rf pgpool-ha-@VERSION@
 

diff --git a/configure.sh b/configure.sh
index d387b95c466c03aa9d49f6df658834417131b887..5452b0b5a6798cb8a60230ac02b9f36ae6802d44 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -4,6 +4,7 @@ PARAMS0=$*
 PARAMS=${PARAMS0//=/ }
 set -- $PARAMS
 
+VERSION=2.1
 WITH_PGSQL=
 WITH_PGPOOL=
 WITH_OCF=
@@ -59,7 +60,8 @@ echo "OCF_DIR: $WITH_OCF_DIR"
 sed -e "s#@PGSQL_DIR@#${WITH_PGSQL_DIR}#g" < Makefile.in | \
        sed -e "s#@PGPOOL_DIR@#${WITH_PGPOOL_DIR}#g" | \
        sed -e "s#@OCF_DIR@#${WITH_OCF_DIR}#g" | \
-       sed -e "s#@INSTALL@#${INSTALL}#g" > Makefile
+       sed -e "s#@INSTALL@#${INSTALL}#g" | \
+       sed -e "s#@VERSION@#${VERSION}#g" > Makefile
 
 echo "Makefile generated"
 echo $0 $PARAMS0 > config.log