updates.

diff --git a/doc/Makefile.am.pre b/doc/Makefile.am.pre
index dde03c1916bbcb0ab7023782a6afdc21558c26d0..6fb9bf0f4bdc39ce823c9d7f56b473c7862e38e6 100644 (file)
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.am.pre
@@ -24,7 +24,6 @@ DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 makerfc = ../scripts/makerfc
 
 all:
-       $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        touch draft-riikonen-silc-spec-05.txt
        touch draft-riikonen-silc-pp-05.txt
        touch draft-riikonen-silc-ke-auth-05.txt
@@ -34,6 +33,7 @@ all:
 
 if SILC_DIST_CLIENT
 dist-hook:
+       $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        rm draft-riikonen*.txt
        touch draft-riikonen-silc-spec-05.txt
        touch draft-riikonen-silc-pp-05.txt
@@ -68,6 +68,7 @@ toolkit-ref-pdf:
 endif
 
 dist-hook:
+       $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        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/doc/silc.yo b/doc/silc.yo
index 968a632cd38ab8bb40e89a88c0b510f46787d40f..a848af339b6f6586ed8af8c92677329500efbcb0 100644 (file)
--- a/doc/silc.yo
+++ b/doc/silc.yo
@@ -40,8 +40,8 @@ same nickname than before detaching and remains on all channels, and it
 seems like user never left the network.
 
 The bf(silc) also supports creation of em(friends) list, which is kind of
-buddy list familiar from IM (Instant Messaging) clients.  By using the
-bf(WHOIS) SILC command with em(-details) option it possible to fetch the
+a buddy list familiar from IM (Instant Messaging) clients.  By using the
+bf(WHOIS) SILC command with em(-details) option it is possible to fetch the
 user's information such as their public keys and certificates, business
 card, pictures, and other information and save them to the friends list.
 The friends list is located at bf(~/.silc/friends/) directory.
@@ -55,9 +55,9 @@ When connecting for the first time to SILC server, user will be asked to
 accept the server's public key.  When key is accepted the bf(silc) saves
 the public key for future into bf(~/.silc/serverkeys/) directory.  The
 next time user connects to same server the public key is verified against
-the saved public key.  The purposeof this public key saving is to avoid
+the saved public key.  The purpose of this public key saving is to avoid
 man-in-the-middle attacks which could be possible if the key would have
-to be verified everytime user connects to the server.
+to be verified every time user connects to the server.
 
 manpageoptions()
 bf(-c) em(host)      Connect to given host

diff --git a/scripts/manpages.pl b/scripts/manpages.pl
index d53eafb8785481ced52b40766aa1ba6c243383a7..56ceefe3a35fef8c62b5b93a608893141b72b69a 100755 (executable)
--- a/scripts/manpages.pl
+++ b/scripts/manpages.pl
@@ -10,6 +10,12 @@ my (@yodl, @men);
 $yodl2man = qx/which yodl2man/;
 chomp($yodl2man);
 
+if ($yodl2man eq "" || $yodl2man =~ m/found/) {
+  print "Yodl is needed to to generate manpages.\n";
+  print "Skipping them...\n";
+  exit;
+}
+
 @yodl = ('silc.yo', 'silcd.yo', 'silcd.conf.yo', 'silc.conf.yo');
 @men  = ('silc.1', 'silcd.8', 'silcd.conf.5', 'silc.conf.5');