From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 7 Sep 2002 19:41:23 +0000 (+0000)
Subject: 	Removed "base version" version from command line.
X-Git-Tag: silc.server.0.9.5~15
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=c0042acc324966ed35f8f6c13294e862fbf7bb11

	Removed "base version" version from command line.
---

diff --git a/prepare b/prepare
index 12249543..5397d673 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
@@ -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
@@ -140,7 +136,7 @@ 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 $distribution\"" >>$file
 echo "#define SILC_NAME \"SILC $distribution\"" >>$file
@@ -153,7 +149,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