Merged silc_1_0_branch to trunk.

[silc.git] / scripts / silcdoc / silcdoc

diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index 6c3ed1785c43c3967b3b97b9ccd84ec7c95c6264..9f7bffcea37b942ee9d6c6fc55c8051752820af1 100755 (executable)
--- a/scripts/silcdoc/silcdoc
+++ b/scripts/silcdoc/silcdoc
@@ -78,6 +78,7 @@ if [ "$TYPE" = "PS" ]; then
   cd $path
 
   rm -rf /tmp/silcdoc.tex
+  exit 0
 fi
 
 #
@@ -99,8 +100,8 @@ if [ "$TYPE" = "HTML" ]; then
 
   # Generate index template from the DIRECTORY files. The template for
   # the generated index template is INDEX.tmpl.
-  files=`find $SRC -name "DIRECTORY"`
-  for i in $files
+  dfiles=`find $SRC -name "DIRECTORY"`
+  for i in $dfiles
   do
     # Get library name
     name=`grep "@LIBRARY=" $i |cut -d=  -f2`
@@ -176,8 +177,7 @@ if [ "$TYPE" = "HTML" ]; then
   done
 
   # Generate the index and TOC files from the DIRECTORY files
-  files=`find $SRC -name "DIRECTORY"`
-  for i in $files
+  for i in $dfiles
   do
     # Get library name
     name=`grep "@LIBRARY=" $i |cut -d=  -f2`
@@ -196,17 +196,18 @@ if [ "$TYPE" = "HTML" ]; then
 
   # Generate the top index.html file
   index=`find $SRC -name "LIBINDEX"`
-  version=`grep SILC_VERSION_STRING $SRC/../includes/version_internal.h |cut -d\"  -f2`
+  version=`grep "define SILC_VERSION_STRING" $SRC/../includes/silcversion.h |cut -d\"  -f2`
   curdate=`date`
   sed -e "/@VERSION@/s//$version/" -e "/@DATE@/s//$curdate/" -e "/@BODY@/ r $DST/index.html.tmp" -e s/@BODY@//g $index >$DST/index.html
   sh gen.sh $DST gen_index.php 2 $DST/index.html $DST/index.html
 
   # Generate the index toolkit_index.html file
-  $ROBO /tmp/silcdoc.html/silcdoc_xref $DST/toolkit_index.html INDEX HTML TITLE "SILC Toolkit Index"
+  $ROBO $DST/silcdoc_xref $DST/toolkit_index.html INDEX HTML TITLE "SILC Toolkit Index"
   sh gen.sh $DST gen_index.php 2 $DST/toolkit_index.html $DST/toolkit_index.html
 
   # Cleanup
   rm -rf $DST/index.html.tmp
   rm -rf /tmp/silcdoc.html
   rm -rf /tmp/silcdoc_html.html
+  exit 0
 fi