From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 28 May 2001 08:26:26 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: robodoc-323~276
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=c4e78601427d16d7d522b772075ad990d7e934bf;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index 70c4c1e5..33c0fff8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Mon May 28 10:30:51 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+	* Minor changes to the ./prepare script to change the package
+	  name according the distribution name to the configure.in.
+
 Sun May 27 22:24:57 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Created new distribution system.  Added file `distributions'
diff --git a/configure.in.pre b/configure.in.pre
index 2af2d3fe..db51c3c7 100644
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -34,7 +34,7 @@ case "$target" in
 esac
 
 # ./prepare script will automatically put the correct version. Do not edit!
-AM_INIT_AUTOMAKE(silc, SILC_VERSION)
+AM_INIT_AUTOMAKE(SILC_PACKAGE, SILC_VERSION)
 AC_PREREQ(2.3)
 AM_CONFIG_HEADER(includes/silcdefs.h)
 
diff --git a/prepare b/prepare
index 740cbc94..8719ff7a 100755
--- a/prepare
+++ b/prepare
@@ -25,9 +25,18 @@
 # temporary files (including these prepare* scripts) are removed.
 #
 
+#
+# Usage: ./prepare [<distribution> <base version> <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
+# distributions that used the SILC_DISTRIBUTION_VERSION define in the
+# code.  The base version is the SILC_VERSION_STRING define.
+#
+
 #
 # SILC Distribution versions. Set here or give the version on the command
-# line, as argument.
+# line as argument.
 #
 SILC_VERSION=0.2.6			# Base version
 
@@ -46,6 +55,11 @@ if test "$version" = ""; then
   version=$SILC_VERSION;
 fi
 
+dist_version=$3
+if test "$dist_version" = ""; then
+  dist_version=$version
+fi
+
 echo "Preparing $distribution distribution version $version"
 
 # Go though the subdirs and create the Makefile.ams from the
@@ -62,13 +76,17 @@ do
     cd $path
     continue;
   fi
-  sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
+  if [ -f Makefile.am.pre ]; then
+    sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
+  fi
   cd $path
 done
 cd $path
 
 # Replace version string and create configure.in
-sed -e "/SILC_VERSION/s//$version/" configure.in.pre >configure.in
+sed -e "/SILC_VERSION/s//$version/" configure.in.pre >configure.in2
+sed -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in2 >configure.in
+rm -f configure.in2
 
 aclocal
 autoconf