From 868d15d9fad7749930b0b43f618801f70e4bd406 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 7 Apr 2001 22:52:30 +0000
Subject: [PATCH] 	updates.

---
 CHANGES                |  4 +++
 Makefile.am            | 35 ++++++++++++++++++++-
 apps/silcd/Makefile.am |  2 +-
 configure.in.pre       | 71 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index de5661dd..05f1a0c9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Sun Apr  8 01:37:21 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+	* Made preliminary `make install' work.
+
 Thu Apr  5 17:42:30 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Added SilcServerRekey context into silcd/idlist.h.
diff --git a/Makefile.am b/Makefile.am
index 2b898b92..e51b999f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 #
-#  Copyright (C) 2000 Pekka Riikonen
+#  Copyright (C) 2000 - 2001 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -27,3 +27,36 @@ dist-bzip: distdir
 	-rm -rf $(distdir)
 
 EXTRA_DIST = CHANGES CREDITS
+
+#
+# Installing of SILC into the system
+#
+
+modulesdir = $(prefix)/@MODULESDIR@
+helpdir = $(prefix)/@HELPDIR@
+docdir = $(prefix)/@DOCDIR@
+etcdir = @ETCDIR@
+
+install-dirs:
+	-mkdir -p $(etcdir)
+	-mkdir -p $(modulesdir)
+	-mkdir -p $(helpdir)
+	-mkdir -p $(docdir)
+
+generate-server-key:
+	-umask 022;
+	-echo Generating SILC Server key into $(etcdir)
+	-$(sbindir)/silcd -k $(etcdir)
+
+sim-install:
+	-echo Installing SIM modules into $(modulesdir)
+	-cp -fR $(srcdir)/lib/silcsim/modules/*.so $(modulesdir)/
+
+doc-install:
+	-cp -fR $(srcdir)/doc/* $(docdir)/
+
+etc-install:
+	-cp -fR $(srcdir)/doc/example_silcd.conf $(etcdir)/silcd.conf
+	-cp -fR $(srcdir)/doc/example_silc.conf $(etcdir)/silc.conf
+
+install-data-hook: install-dirs generate-server-key sim-install doc-install
diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index b3ca5ab1..ea704eca 100644
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -18,7 +18,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS = silcd
+sbin_PROGRAMS = silcd
 
 silcd_SOURCES = \
 	protocol.c \
diff --git a/configure.in.pre b/configure.in.pre
index ef6b11a0..2f764855 100644
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -116,6 +116,77 @@ AC_CHECK_HEADERS(dlfcn.h,
     AC_MSG_RESULT(no SIM support found)),
   AC_MSG_RESULT(no SIM support found))
 
+#
+# Installation
+#
+
+# Default installation destination
+AC_PREFIX_DEFAULT(/usr/local/silc/)
+
+# etc directory
+ETCDIR="/etc/silc"
+AC_ARG_WITH(etcdir,
+[  --with-etcdir[=PATH]    Directory for system files [/etc/silc]],
+[ case "$withval" in
+  no)
+    ;;
+  yes)
+    ;;
+  *)
+    ETCDIR="$withwal"
+    ;;
+  esac ],
+)
+AC_SUBST(ETCDIR)
+
+# help directory
+HELPDIR="help"
+AC_ARG_WITH(helpdir,
+[  --with-helpdir[=PATH]   Directory for SILC help files [PREFIX/help]],
+[ case "$withval" in
+  no)
+    ;;
+  yes)
+    ;;
+  *)
+    HELPDIR="$withwal"
+    ;;
+  esac ],
+)
+AC_SUBST(HELPDIR)
+
+# doc directory
+DOCDIR="doc"
+AC_ARG_WITH(docdir,
+[  --with-docdir[=PATH]    Directory for SILC documentation [PREFIX/doc]],
+[ case "$withval" in
+  no)
+    ;;
+  yes)
+    ;;
+  *)
+    DOCDIR="$withwal"
+    ;;
+  esac ],
+)
+AC_SUBST(DOCDIR)
+
+# SIM modules directory
+MODULESDIR="modules"
+AC_ARG_WITH(simdir,
+[  --with-simdir[=PATH]    Directory for SIM modules [PREFIX/modules]],
+[ case "$withval" in
+  no)
+    ;;
+  yes)
+    ;;
+  *)
+    MODULESDIR="$withwal"
+    ;;
+  esac ],
+)
+AC_SUBST(MODULESDIR)
+
 # Debug checking
 AC_MSG_CHECKING(for enabled debugging)
 AC_ARG_ENABLE(debug,
-- 
2.24.0