Typo fixes.

diff --git a/doc/Makefile.am.pre b/doc/Makefile.am.pre
index e7a3e3e31bbd703e8a28c25233c583c2197c455e..ce321a00b0a25ef403afad43e89ca7daaaaa587e 100644 (file)
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.am.pre
@@ -42,15 +42,30 @@ dist-hook:
        touch draft-riikonen-presence-attrs-00.txt
 else
 if SILC_DIST_TOOLKIT
-dist-hook:
-       -@if test -f ../util/robodoc/Source/robodoc ; then \
+toolkit-ref-html:
+       -@if test -f $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; then \
          echo Generating Toolkit Reference Manual ; \
          rm -rf toolkit ; mkdir toolkit ; cd ../scripts/silcdoc ; \
-         ./silcdoc HTML ../../lib/ ../../doc/toolkit \
-         ../../util/robodoc/Source/robodoc ; \
+         ./silcdoc HTML ../../lib/ $(SILC_TOP_SRCDIR)/doc/toolkit \
+         $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; \
+       else  \
+         echo ROBODoc is not compiled! Cannot generate documentation! ; \
+        fi
+
+toolkit-ref-ps:
+       -@if test -f $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; then \
+         echo Generating Toolkit Reference Manual ; \
+         cd ../scripts/silcdoc ; \
+         ./silcdoc PS ../../lib/ $(SILC_TOP_SRCDIR)/doc/toolkit.ps \
+         $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; \
        else  \
          echo ROBODoc is not compiled! Cannot generate documentation! ; \
         fi
+
+toolkit-ref-pdf:
+       -ps2pdf $(SILC_TOP_SRCDIR)/doc/toolkit.ps $(SILC_TOP_SRCDIR)/doc/toolkit.pdf
+
+dist-hook: toolkit-ref-html
        touch draft-riikonen-silc-spec-05.txt
        touch draft-riikonen-silc-pp-05.txt
        touch draft-riikonen-silc-ke-auth-05.txt

diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index 6c3ed1785c43c3967b3b97b9ccd84ec7c95c6264..3bf1cccb335fa04c4535a4b9a1693f6f953d5c8a 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
 
 #
@@ -202,11 +203,12 @@ if [ "$TYPE" = "HTML" ]; then
   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