updates.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index 7a459ea1f05b4e65b529a34a6e06b6374e129dd3..ce5889454864bd6b6e1c799ff2960a45dfbab5b1 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -18,10 +18,11 @@
 
 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
+include $(top_srcdir)/Makefile.defines.in
 
 dist-bzip: distdir
        -chmod -R a+r $(distdir)
@@ -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)/