--- Makefile.in.orig	Sun Nov 11 15:02:16 2001
+++ Makefile.in	Mon Nov 12 22:15:00 2001
@@ -145,9 +145,9 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-COMMONDIRS = lib irssi silc silcd doc includes
-SUBDIRS = lib silcd doc includes
-DIST_SUBDIRS = lib silcd doc includes
+COMMONDIRS = lib irssi silcd includes
+SUBDIRS = lib silcd includes
+DIST_SUBDIRS = lib silcd includes
 
 #
 # INCLUDE defines
@@ -512,9 +512,6 @@
 
 install-dirs:
 	-mkdir -p $(etcdir)
-	-mkdir -p $(modulesdir)
-	-mkdir -p $(helpdir)
-	-mkdir -p $(docdir)
 	-mkdir -p $(logsdir)
 
 generate-server-key:
@@ -538,18 +535,13 @@
 	$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
 
 etc-install:
-	-@if test '!' -f $(etcdir)/silcd.conf ; then \
+	-@if test '!' -f $(etcdir)/silcd.conf.sample ; then \
 	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-	  $(etcdir)/silcd.conf; \
-          chmod go= $(etcdir)/silcd.conf; \
-	fi
-	-@if test '!' -f $(etcdir)/silc.conf ; then \
-	  $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
-	  $(etcdir)/silc.conf; \
+	  $(etcdir)/silcd.conf.sample; \
 	fi
 
-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
-@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs etc-install
+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs etc-install
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: