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

diff --git a/Makefile.am.pre b/Makefile.am.pre
index faeab165..510b418a 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
@@ -18,28 +17,30 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = lib irssi silc silcd doc includes
+COMMONDIRS = lib irssi silc silcd doc includes
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_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)
 
 install-dirs:
 	-mkdir -p $(etcdir)
@@ -49,7 +50,9 @@ 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)/
@@ -57,7 +60,7 @@ sim-install:
 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)/
@@ -66,6 +69,12 @@ doc-install:
 	$(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/
+
 etc-install:
 	-@if test '!' -f $(etcdir)/silcd.conf ; then \
 	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
@@ -77,4 +86,8 @@ etc-install:
 	  $(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
+install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
+endif