Manual pages installation fix patch by Ville Räsänen.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 177e366f11d5a8afbf58944a2ea7cb714ecd3aa9..4b22a96795887fc8b57deb939052d8a75c004253 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 2000 - 2002Pekka 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
@@ -18,8 +18,11 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 COMMONDIRS = lib irssi silc silcd doc includes
-SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
-DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
+
+# Sub directories defined by "distributions" file, and can be overridden
+# with ./configure, which substitutes these variables.
+SUBDIRS = @SILC_DIST_SUBDIRS@
+DIST_SUBDIRS = @SILC_DIST_SUBDIRS@
 
 include $(top_srcdir)/Makefile.defines.in
 
@@ -41,6 +44,7 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
+manualdir = $(DESTDIR)$(silc_mandir)
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -48,6 +52,10 @@ install-dirs:
        -mkdir -p $(helpdir)
        -mkdir -p $(docdir)
        -mkdir -p $(logsdir)
+       -mkdir -p $(manualdir)/man1
+       -mkdir -p $(manualdir)/man5
+       -mkdir -p $(manualdir)/man8
+
 
 generate-server-key:
        -@if test '!' -f $(etcdir)/silcd.pub ; then \
@@ -58,37 +66,44 @@ sim-install:
        -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
 
 doc-install:
-       $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/README $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1
+       -$(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8;
+       -$(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5;
+       -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/README* $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
 
 toolkit-install:
        -mkdir -p $(docdir)/toolkit/
        -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
        -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
+       -cp -R $(srcdir)/tutorial $(prefix)
 
 examples-install:
        -mkdir -p $(docdir)/examples/
-       $(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
-       $(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
-       $(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
 
 etc-install:
        -@if test '!' -f $(etcdir)/silcd.conf ; then \
          $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-         $(etcdir)/silcd.conf; \
+               $(etcdir)/silcd.conf; \
+         $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
+               $(etcdir)/silcalgs.conf; \
           chmod go= $(etcdir)/silcd.conf; \
        fi
-       -@if test '!' -f $(etcdir)/silc.conf ; then \
-         $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
-         $(etcdir)/silc.conf; \
+       -@if test '!' -d $(srcdir)/irssi ; then \
+         if test '!' -f $(etcdir)/silc.conf ; then \
+           $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
+               $(etcdir)/silc.conf; \
+         fi; \
        fi
 
 if SILC_DIST_CLIENT