X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=Makefile.am.pre;h=5c0696c5ebbf4d3643996957589b9863d1c99148;hb=refs%2Fheads%2Fsilcer;hp=48c7658bdc634fc69ec9ecd9ddc32f0a417c1b51;hpb=918728123e9dfe46e8fe3233fdcbcfeae61fcc2c;p=silc.git

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 48c7658b..5c0696c5 100644
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -26,21 +26,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,7 +51,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)/
@@ -58,7 +61,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)/
@@ -78,4 +81,8 @@ etc-install:
 	  $(etcdir)/silc.conf; \
 	fi
 
+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 etc-install
+endif