--- Makefile.in.orig	Wed Jan 14 19:28:32 2004
+++ Makefile.in	Wed Jan 14 20:07:01 2004
@@ -283,7 +283,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
-COMMONDIRS = lib irssi silc silcd doc includes
+COMMONDIRS = lib irssi silc includes
 
 # Sub directories defined by "distributions" file, and can be overridden
 # with ./configure, which substitutes these variables.
@@ -316,7 +316,6 @@
 # Installing of SILC into the system
 #
 etcdir = $(DESTDIR)$(silc_etcdir)
-modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
@@ -759,22 +758,17 @@
 
 install-dirs:
 	-mkdir -p $(etcdir)
-	-mkdir -p $(modulesdir)
 	-mkdir -p $(docdir)
 
 install-dirs-client: install-dirs
 	-mkdir -p $(helpdir)
-	-mkdir -p $(mandir)/man1
 
 install-dirs-server: install-dirs
 	-mkdir -p $(logsdir)
-	-mkdir -p $(mandir)/man5
-	-mkdir -p $(mandir)/man8
 
 doc-install:
 	-$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
 	-$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
-	-$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
 	-$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
 	-$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
 	-$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
@@ -798,12 +792,8 @@
 	fi
 
 etc-install-client:
-	-@if test '!' -d $(srcdir)/irssi ; then \
-	  if test '!' -f $(etcdir)/silc.conf ; then \
 	    $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
-	    	$(etcdir)/silc.conf; \
-	  fi; \
-	fi
+		$(etcdir)/silc.conf.sample
 
 etc-install-server:
 	-@if test '!' -f $(etcdir)/silcd.conf ; then \
@@ -814,9 +804,6 @@
           chmod go= $(etcdir)/silcd.conf; \
 	fi
 
-sim-install:
-	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
-
 toolkit-install:
 	-mkdir -p $(docdir)/toolkit/
 	-$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
@@ -833,9 +820,9 @@
 	  $(sbindir)/silcd -C $(etcdir); \
 	fi
 
-@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
-@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_TRUE@install-data-hook: install-dirs-client doc-install-client etc-install-client
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server doc-install-server examples-install etc-install-server generate-server-key
 # 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: