X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=Makefile.am.pre;h=e20a823ba1a666c4fa4d7d14d26135876147555d;hp=510b418adb5806facc45c6f638bebfa086d27cb1;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=6394d86063413bc1c473723f3ef971840195bcd3

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 510b418a..e20a823b 100644
--- 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
 
@@ -30,7 +33,7 @@ dist-bzip: distdir
 	-rm -rf $(distdir)
 
 SILC_EXTRA_DIST = SILC_DISTRIBUTION_EXTRA
-EXTRA_DIST = CHANGES CREDITS $(SILC_EXTRA_DIST)
+EXTRA_DIST = libtoolfix CHANGES CREDITS $(SILC_EXTRA_DIST)
 
 #
 # Installing of SILC into the system
@@ -45,49 +48,85 @@ logsdir = $(DESTDIR)$(silc_logsdir)
 install-dirs:
 	-mkdir -p $(etcdir)
 	-mkdir -p $(modulesdir)
-	-mkdir -p $(helpdir)
 	-mkdir -p $(docdir)
-	-mkdir -p $(logsdir)
 
-generate-server-key:
-	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-	  $(sbindir)/silcd -C $(etcdir); \
-	fi
+install-dirs-client: install-dirs
+	-mkdir -p $(helpdir)
+	-mkdir -p $(mandir)/man1
 
-sim-install:
-	-cp -fR $(srcdir)/lib/silcsim/modules/*.so $(modulesdir)/
+install-dirs-server: install-dirs
+	-mkdir -p $(logsdir)
+	-mkdir -p $(mandir)/man5
+	-mkdir -p $(mandir)/man8
 
 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/*.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)/
 
-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/
+doc-install-client: doc-install
+	$(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
+	-@if test -f $(srcdir)/doc/silc.1 ; then \
+	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
+	fi
+
+doc-install-server: doc-install
+	-$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
+	-@if test -f $(srcdir)/doc/silcd.8 ; then \
+	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
+	fi
+	-@if test -f $(srcdir)/doc/silcd.conf.5 ; then \
+	 $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \
+	fi
+
+etc-install-client:
+	-@if test '!' -d $(srcdir)/irssi ; then \
+	  if test '!' -f $(etcdir)/silc.conf ; then \
+	    $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
+	    	$(etcdir)/silc.conf; \
+	  fi; \
+	fi
 
-etc-install:
+etc-install-server:
 	-@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; \
+
+sim-install:
+	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
+
+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/
+
+generate-server-key:
+	-@if test '!' -f $(etcdir)/silcd.pub ; then \
+	  $(sbindir)/silcd -C $(etcdir); \
 	fi
 
 if SILC_DIST_CLIENT
-install-data-hook: install-dirs sim-install doc-install etc-install
+install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
+else
+if SILC_DIST_TOOLKIT
+install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key
 else
-install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
+install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
+endif
 endif