autoconf update.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index dad214450bcfa82ef841d36a3c6ae7306e07cd26..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
 
@@ -65,14 +68,14 @@ 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/silc* $(docdir)/toolkit
-       -$(INSTALL_DATA) $(srcdir)/doc/toolkit/index* $(docdir)/toolkit
+       -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
+       -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
 
 examples-install:
        -mkdir -p $(docdir)/examples/
@@ -83,11 +86,13 @@ 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