From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 1 May 2005 08:00:01 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: autodist.1.3~22
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=56fa26c39a086e22141a3ee76a5fdf8a9028b08d;p=silc.git

	updates.
---

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 6da94f7f..f45ac7cc 100755
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -1844,15 +1844,18 @@ if test $# != 0; then
   distfile=$distribution
   shift
 fi
+
 ad_parse_distribution $distribution false
-ad_log "  Distribution: $distribution $dist_version"
-ad_log ""
-ad_process_distdefs
 
 if test $# != 0; then
   dist_version="${1}";
 fi
 
+ad_log "  Distribution: $distribution $dist_version"
+ad_log ""
+
+ad_process_distdefs
+
 ad_debug "Preparing source tree for configuration and compilation..."
 ad_debug "Preparing $distribution distribution version $dist_version"
 
diff --git a/scripts/silcdoc/gen.sh b/scripts/silcdoc/gen.sh
index c09c9af2..3fe9452a 100755
--- a/scripts/silcdoc/gen.sh
+++ b/scripts/silcdoc/gen.sh
@@ -3,6 +3,6 @@
 cat << EOF > tmp.php
 <?php \$page="$4"; \$dest="$1"; \$type="$3"; require "$2"; ?>
 EOF
-php -f tmp.php >$5.tmp
-mv $5.tmp $5
+php -f tmp.php >"$5".tmp
+mv "$5".tmp "$5"
 rm -f tmp.php
diff --git a/scripts/silcdoc/gen_detail.php b/scripts/silcdoc/gen_detail.php
index 7b3d1298..f17fbbb9 100644
--- a/scripts/silcdoc/gen_detail.php
+++ b/scripts/silcdoc/gen_detail.php
@@ -7,8 +7,7 @@
 
   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
diff --git a/scripts/silcdoc/gen_html_detail.php b/scripts/silcdoc/gen_html_detail.php
index 999fcb16..ae7f4493 100644
--- a/scripts/silcdoc/gen_html_detail.php
+++ b/scripts/silcdoc/gen_html_detail.php
@@ -7,8 +7,7 @@
 
   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
diff --git a/scripts/silcdoc/gen_index.php b/scripts/silcdoc/gen_index.php
index a263d059..b425a791 100644
--- a/scripts/silcdoc/gen_index.php
+++ b/scripts/silcdoc/gen_index.php
@@ -7,8 +7,7 @@
 
   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
diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index 9f7bffce..8425249e 100755
--- a/scripts/silcdoc/silcdoc
+++ b/scripts/silcdoc/silcdoc
@@ -104,7 +104,7 @@ if [ "$TYPE" = "HTML" ]; then
   for i in $dfiles
   do
     # Get library name
-    name=`grep "@LIBRARY=" $i |cut -d=  -f2`
+    name=`grep "@LIBRARY=" $i |cut -d=  -f2-`
     fname=`grep "@FILENAME=" $i |cut -d=  -f2`
     links=`grep "@LINK=" $i |cut -d=  -f2 |cut -d:  -f1`
 
@@ -113,7 +113,7 @@ if [ "$TYPE" = "HTML" ]; then
     echo "<a href="$fname"><img src="box.gif" border="0" alt="">$name</a><br />" >>$DST/index.tmpl
     for k in $links
     do
-      n=`grep $k $i |cut -d=  -f2 |cut -d:  -f2`
+      n=`grep $k $i |cut -d=  -f2 |cut -d:  -f2-`
       echo "<li><a href="$k">$n</a>" >>$DST/$fname.links
       echo "&nbsp;&nbsp;&nbsp; <a href="$k"><img src="box2.gif" border="0" alt="">$n</a><br />" >>$DST/index.tmpl
     done
@@ -170,7 +170,7 @@ if [ "$TYPE" = "HTML" ]; then
     files=`find $DST -name ""$i"-*.html"`
     for k in $files
     do
-      sh gen.sh $DST gen_index.php 0 $k $k
+      sh gen.sh $DST gen_index.php 0 "$k" "$k"
     done
 
     rm -f $DST/$i-index.tmpl
@@ -180,7 +180,7 @@ if [ "$TYPE" = "HTML" ]; then
   for i in $dfiles
   do
     # Get library name
-    name=`grep "@LIBRARY=" $i |cut -d=  -f2`
+    name=`grep "@LIBRARY=" $i |cut -d=  -f2-`
     fname=`grep "@FILENAME=" $i |cut -d=  -f2`
 
     # Generate links for this library