Merged from silc_1_0_branch.

[silc.git] / Makefile.am.pre

diff --git a/Makefile.am.pre b/Makefile.am.pre
index d34eacbacb6ef5c38413e05cc43a659ba585bde2..e20a823ba1a666c4fa4d7d14d26135876147555d 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -33,7 +33,7 @@ dist-bzip: distdir
        -rm -rf $(distdir)
 
 SILC_EXTRA_DIST = SILC_DISTRIBUTION_EXTRA
-EXTRA_DIST = CHANGES CREDITS $(SILC_EXTRA_DIST)
+EXTRA_DIST = libtoolfix CHANGES CREDITS $(SILC_EXTRA_DIST)
 
 #
 # Installing of SILC into the system
@@ -44,74 +44,89 @@ modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
 logsdir = $(DESTDIR)$(silc_logsdir)
-manualdir = $(DESTDIR)/man
 
 install-dirs:
        -mkdir -p $(etcdir)
        -mkdir -p $(modulesdir)
-       -mkdir -p $(helpdir)
        -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 $(manualdir)/man1
-       -mkdir -p $(manualdir)/man5
-       -mkdir -p $(manualdir)/man8
+       -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)/
+       -$(INSTALL_DATA) $(srcdir)/README* $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
+       -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+
+doc-install-client: doc-install
+       $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
+       -@if test -f $(srcdir)/doc/silc.1 ; then \
+        $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
+       fi
 
-generate-server-key:
-       -@if test '!' -f $(etcdir)/silcd.pub ; then \
-         $(sbindir)/silcd -C $(etcdir); \
+doc-install-server: doc-install
+       -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
+       -@if test -f $(srcdir)/doc/silcd.8 ; then \
+        $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
+       fi
+       -@if test -f $(srcdir)/doc/silcd.conf.5 ; then \
+        $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \
+       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
+
+etc-install-server:
+       -@if test '!' -f $(etcdir)/silcd.conf ; then \
+         $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
+               $(etcdir)/silcd.conf; \
+         $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
+               $(etcdir)/silcalgs.conf; \
+          chmod go= $(etcdir)/silcd.conf; \
        fi
 
 sim-install:
        -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
 
-doc-install:
-       $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1
-       $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8
-       $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5
-       $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/README* $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
-       $(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
-
 toolkit-install:
        -mkdir -p $(docdir)/toolkit/
        -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
        -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
-        -cp -R $(srcdir)/tutorial $(prefix)
+       -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/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
+       -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
 
-etc-install:
-       -@if test '!' -f $(etcdir)/silcd.conf ; then \
-         $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-               $(etcdir)/silcd.conf; \
-         $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
-               $(etcdir)/silcalgs.conf; \
-          chmod go= $(etcdir)/silcd.conf; \
-       fi
-       -@if test '!' -d $(srcdir)/irssi ; then \
-         if test '!' -f $(etcdir)/silc.conf ; then \
-           $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
-               $(etcdir)/silc.conf; \
-         fi; \
+generate-server-key:
+       -@if test '!' -f $(etcdir)/silcd.pub ; then \
+         $(sbindir)/silcd -C $(etcdir); \
        fi
 
 if SILC_DIST_CLIENT
-install-data-hook: install-dirs sim-install doc-install etc-install
+install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
 else
 if SILC_DIST_TOOLKIT
-install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
+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
 else
-install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
+install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
 endif
 endif