updates.

[silc.git] / prepare

diff --git a/prepare b/prepare
index b9a8b856609df025c658bcfad605a7456ddbeb53..0f7b15b806edac0cda2d8b6d72acd1a6b80161a7 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -8,8 +8,7 @@
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,7 +37,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.5.1                     # Base version
+SILC_VERSION=0.6                       # Base version
 
 
 #############################################################################
@@ -68,7 +67,7 @@ echo "Preparing $distribution distribution version $version (package $dist_versi
 #
 subdirs=`grep "$distribution"_SUBDIRS= distributions |cut -d=  -f2`
 ed=`grep "$distribution"_EXTRA_DIST= distributions |cut -d=  -f2`
-sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_DISTRIBUTION_EXTRA/s//$ed/" Makefile.am.pre >Makefile.am
+sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_DISTRIBUTION_EXTRA/s,,$ed," Makefile.am.pre >Makefile.am
 path=`pwd`
 for i in $subdirs
 do
@@ -129,20 +128,22 @@ cp Makefile.defines_int.in lib/silcmath/mpi
 
 aclocal
 autoconf
-autoheader
+autoheader >/dev/null 2>/dev/null
 automake
 
+echo "Preparing trq"
 cd lib/trq
 aclocal
 autoconf
-autoheader
+autoheader </dev/null 2>/dev/null
 automake >/dev/null 2>/dev/null
 cd ../..
 
+echo "Preparing mpi"
 cd lib/silcmath/mpi
 aclocal
 autoconf
-autoheader
+autoheader </dev/null 2>/dev/null
 automake >/dev/null 2>/dev/null
 cd ../../..
 
@@ -154,6 +155,7 @@ echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
 echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
+echo "Preparing irssi"
 cd irssi
 sh autogen.sh 2>/dev/null 1>/dev/null
 cd ..