--- Makefile.in.orig	Thu Dec  5 19:43:42 2002
+++ Makefile.in	Tue Dec 31 18:26:52 2002
@@ -231,7 +231,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-COMMONDIRS = lib irssi silc silcd doc includes
+COMMONDIRS = lib irssi silcd doc includes
 
 # Sub directories defined by "distributions" file, and can be overridden
 # with ./configure, which substitutes these variables.
@@ -700,7 +700,6 @@
 install-dirs:
 	-mkdir -p $(etcdir)
 	-mkdir -p $(modulesdir)
-	-mkdir -p $(docdir)
 
 install-dirs-client: install-dirs
 	-mkdir -p $(helpdir)
@@ -728,8 +727,7 @@
 	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
 	fi
 
-doc-install-server: doc-install
-	-$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
+doc-install-server:
 	-@if test -f $(srcdir)/doc/silcd.8 ; then \
 	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
 	fi
@@ -746,13 +744,11 @@
 	fi
 
 etc-install-server:
-	-@if test '!' -f $(etcdir)/silcd.conf ; then \
 	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-		$(etcdir)/silcd.conf; \
+		$(etcdir)/silcd.conf.sample; \
 	  $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
-		$(etcdir)/silcalgs.conf; \
-          chmod go= $(etcdir)/silcd.conf; \
-	fi
+		$(etcdir)/silcalgs.conf.sample; \
+          chmod go= $(etcdir)/silcd.conf.sample
 
 sim-install:
 	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
@@ -764,9 +760,9 @@
 	-cp -R $(srcdir)/tutorial $(prefix)
 
 examples-install:
-	-mkdir -p $(docdir)/examples/
-	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
-	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+	-mkdir -p $(prefix)/share/examples/silc
+	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc
+	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(prefix)/share/examples/silc
 
 generate-server-key:
 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
@@ -775,7 +771,7 @@
 
 @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
 @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key
-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server
 # 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: