X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=prepare;h=0f7b15b806edac0cda2d8b6d72acd1a6b80161a7;hp=c44c3cc6a2d72edbb56b55e6773f2f97bc52fd58;hb=e5d8d3db6caa344b3d419b884556c21b15e7d123;hpb=b6847b2657adfce92a5472b4b7d6f869dd460803

diff --git a/prepare b/prepare
index c44c3cc6..0f7b15b8 100755
--- a/prepare
+++ b/prepare
@@ -2,14 +2,13 @@
 #
 #  prepare
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
 #  Copyright (C) 2000 - 2001 Pekka Riikonen
 #
 #  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.3.1			# Base version
+SILC_VERSION=0.6			# Base version
 
 
 #############################################################################
@@ -60,19 +59,20 @@ if test "$dist_version" = ""; then
   dist_version=$version
 fi
 
-echo "Preparing $distribution distribution version $version"
+echo "Preparing $distribution distribution version $version (package $dist_version)"
 
 #
 # Go though the subdirs and create the Makefile.ams from the
 # Makefile.am.pre files.
 #
-subdirs=`grep _"$distribution"_SUBDIRS= distributions |cut -d=  -f2`
-sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" Makefile.am.pre >Makefile.am
+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
 path=`pwd`
 for i in $subdirs
 do
   cd $i
-  sub=`grep _"$distribution"_SUBDIRS_"$i"= $path/distributions |cut -d=  -f2`
+  sub=`grep "$distribution"_SUBDIRS_"$i"= $path/distributions |cut -d=  -f2`
   if test "$sub" = ""; then
     cd $path
     continue;
@@ -101,7 +101,7 @@ dists=`grep DISTRIBUTIONS= distributions |cut -d=  -f2`
 touch am_cond
 for i in $dists
 do
-  dl=`grep _"$i"_DISTLABEL= distributions |cut -d=  -f2`
+  dl=`grep "$i"_DISTLABEL= distributions |cut -d=  -f2`
   echo "#undef $dl" >>acconfig.h
   if test "$i" = "$distribution"; then
     echo "AM_CONDITIONAL($dl, test xtrue = xtrue)" >>am_cond
@@ -111,7 +111,7 @@ do
 done
 
 sed '/SILC_DIST_DEFINE/ r am_cond' configure.in2 >configure.in3
-dl=`grep _"$distribution"_DISTLABEL= distributions |cut -d=  -f2`
+dl=`grep "$distribution"_DISTLABEL= distributions |cut -d=  -f2`
 sed -e "/SILC_DIST_DEFINE/s//$dl/" configure.in3 >configure.in
 rm -f configure.in2 configure.in3 am_cond
 
@@ -128,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 ../../..
 
@@ -152,8 +154,8 @@ echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file
 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 ..