projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9941588
)
Removed "base version" version from command line.
author
Pekka Riikonen
<priikone@silcnet.org>
Sat, 7 Sep 2002 19:41:23 +0000
(19:41 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Sat, 7 Sep 2002 19:41:23 +0000
(19:41 +0000)
prepare
patch
|
blob
|
history
diff --git
a/prepare
b/prepare
index 122495435126b984d68596924a586b6cdb214387..5397d673f1fa2cf2a65e1c26ecebc8c38e067aee 100755
(executable)
--- 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
#
# 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
distribution="toolkit";
fi
-version=$2
-if test "$version" = ""; then
- version=$SILC_VERSION;
-fi
-
-dist_version=$3
+dist_version=$2
if test "$dist_version" = ""; then
if test "$dist_version" = ""; then
- dist_version=$
version
+ dist_version=$
SILC_VERSION
fi
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
#
# 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
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
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
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
echo "#define IRSSI_VERSION_DATE $version_date" >> $file
echo "#define IRSSI_VERSION_TIME $version_date" >> $file