X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=Makefile.am.pre;h=11ef6d0068bb5e2b9826d619e3d3658b5305c8a5;hb=refs%2Fheads%2Fsilc.protocol.1.0.branch;hp=48c7658bdc634fc69ec9ecd9ddc32f0a417c1b51;hpb=918728123e9dfe46e8fe3233fdcbcfeae61fcc2c;p=silc.git

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 48c7658b..11ef6d00 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
 #
 #  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
@@ -26,21 +25,22 @@ 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)
 
 install-dirs:
 	-mkdir -p $(etcdir)
@@ -50,32 +50,55 @@ install-dirs:
 	-mkdir -p $(logsdir)
 
 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/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)/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/
+	$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(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 \
+	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
 	  $(etcdir)/silc.conf; \
 	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