autoconf update.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 28ca886b3654707b7f9b0a40f45bc84c54ba45e9..88bb10f77ee8dc8ec9e16129c0976e4ff95c173c 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
 
@@ -55,7 +58,7 @@ generate-server-key:
        fi
 
 sim-install:
-       $(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
+       -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
 
 doc-install:
        $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
@@ -65,10 +68,15 @@ doc-install:
        $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
        $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
        $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/README $(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
+
 examples-install:
        -mkdir -p $(docdir)/examples/
        $(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
@@ -78,16 +86,22 @@ examples-install:
 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 \
+         $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
          $(etcdir)/silc.conf; \
        fi
 
 if SILC_DIST_CLIENT
 install-data-hook: install-dirs sim-install doc-install etc-install
 else
+if SILC_DIST_TOOLKIT
+install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
+else
 install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
 endif
+endif