X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=prepare;h=397bdca87a7b4b3427f3023dda206777454fc8ef;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=ebc33d26280c3689b611638c05953a3dd48bf524;hpb=e91c4073611554c7dfa0786fbda7d8a907ac250a;p=silc.git

diff --git a/prepare b/prepare
index ebc33d26..397bdca8 100755
--- a/prepare
+++ b/prepare
@@ -25,7 +25,7 @@
 #
 
 #
-# Usage: ./prepare [<distribution> <base version> <package version>]
+# Usage: ./prepare [<distribution> <package version>]
 #
 # If <package version> is omitted <base version> is used as package
 # version.  The package version appears in the package name and in those
@@ -37,7 +37,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.9.3			# Base version
+SILC_VERSION=0.9.10			# Base version
 
 #############################################################################
 
@@ -48,17 +48,13 @@ if test "$distribution" = ""; then
   distribution="toolkit";
 fi
 
-version=$2
-if test "$version" = ""; then
-  version=$SILC_VERSION;
-fi
-
-dist_version=$3
+dist_version=$2
 if test "$dist_version" = ""; then
-  dist_version=$version
+  dist_version=$SILC_VERSION
 fi
 
-echo "Preparing $distribution distribution version $version (package $dist_version)"
+
+echo "Preparing $distribution distribution version $dist_version"
 
 #
 # Go though the subdirs and create the Makefile.ams from the
@@ -128,21 +124,23 @@ cp Makefile.defines_int.in lib/silcmath/mpi
 aclocal
 autoconf
 autoheader >/dev/null 2>/dev/null
+libtoolize --automake --copy
 automake
 
 echo "Preparing mpi"
 cd lib/silcmath/mpi
 aclocal
 autoconf
-autoheader </dev/null 2>/dev/null
+autoheader >/dev/null 2>/dev/null
+libtoolize --automake --copy
 automake >/dev/null 2>/dev/null
 cd ../../..
 
 file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
-echo "#define SILC_VERSION_STRING \"$version\"" >>$file
+echo "#define SILC_VERSION_STRING \"$dist_version\"" >>$file
 echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file
-echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.1-$dist_version\"" >>$file
+echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.2-$dist_version $distribution\"" >>$file
 echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
@@ -153,7 +151,7 @@ cd ..
 file=irssi/irssi-version.h.in
 version_date=`date +%Y%m%d`
 echo "/* automatically created by autogen.sh */" > $file
-echo "#define IRSSI_VERSION \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC Toolkit $version)\"" >>$file
+echo "#define IRSSI_VERSION \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC $dist_version)\"" >>$file
 echo "#define IRSSI_VERSION_DATE $version_date" >> $file
 echo "#define IRSSI_VERSION_TIME $version_date" >> $file