Imported robodoc

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 0723031d1bbafb6e3f6a2c1463d05dd9d8f98bb4..a37ff3acc6738f814ad998fbaf175cf5e4fa773a 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -18,26 +18,30 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = lib 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)
        -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 = @ETCDIR@
-modulesdir = $(prefix)/@MODULESDIR@
-helpdir = $(prefix)/@HELPDIR@
-docdir = $(prefix)/@DOCDIR@
-logsdir = $(prefix)/@LOGSDIR@
+etcdir = $(silc_etcdir)
+modulesdir = $(silc_modulesdir)
+helpdir = $(silc_helpdir)
+docdir = $(silc_docdir)
+logsdir = $(silc_logsdir)
 
 install-dirs:
        -mkdir -p $(etcdir)
@@ -47,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)/