X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=Makefile.am.pre;h=4b22a96795887fc8b57deb939052d8a75c004253;hb=025fc27fe998393c10f74e21be32f70f4626640d;hp=7a459ea1f05b4e65b529a34a6e06b6374e129dd3;hpb=4dce60bf36bb0f2533d1c750d6ca96078f335aa3;p=silc.git

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 7a459ea1..4b22a967 100644
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -1,14 +1,13 @@
 #
 #  Makefile.am
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,28 +17,34 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = lib silc silcd doc includes
-DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
+COMMONDIRS = lib irssi silc silcd doc includes
 
-include $(top_srcdir)/Makefile.defines
+# 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
 
 dist-bzip: distdir
 	-chmod -R a+r $(distdir)
-	-$(TAR) chof $(distdir).tar $(distdir)
+	-tar chof $(distdir).tar $(distdir)
 	-bzip2 $(distdir).tar
 	-rm -rf $(distdir)
 
-EXTRA_DIST = CHANGES CREDITS
+SILC_EXTRA_DIST = SILC_DISTRIBUTION_EXTRA
+EXTRA_DIST = CHANGES CREDITS $(SILC_EXTRA_DIST)
 
 #
 # Installing of SILC into the system
 #
 
-etcdir = $(silc_etcdir)
-modulesdir = $(silc_modulesdir)
-helpdir = $(silc_helpdir)
-docdir = $(silc_docdir)
-logsdir = $(silc_logsdir)
+etcdir = $(DESTDIR)$(silc_etcdir)
+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)
@@ -47,34 +52,66 @@ 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:
-	-$(sbindir)/silcd -C $(etcdir)
+	-@if test '!' -f $(etcdir)/silcd.pub ; then \
+	  $(sbindir)/silcd -C $(etcdir); \
+	fi
 
 sim-install:
-	-cp -fR $(srcdir)/lib/silcsim/modules/*.so $(modulesdir)/
+	-$(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/
 
 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
 
-install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
+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