From: Pekka Riikonen Date: Fri, 29 Apr 2005 17:42:21 +0000 (+0000) Subject: Moved installation into their respective Makefiles from X-Git-Tag: autodist.1.3~30 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=836954be2353d7dae7081d4cc716bc582fd14c5c Moved installation into their respective Makefiles from the top Makefile. --- diff --git a/Makefile.ad b/Makefile.ad index 99046c17..471ca01a 100644 --- a/Makefile.ad +++ b/Makefile.ad @@ -42,37 +42,13 @@ EXTRA_DIST = \ #endif SILC_DIST_SILC #ifdef SILC_DIST_SILC -# -# Installing of SILC into the system -# - -install-dirs: - -mkdir -p $(etcdir) - -mkdir -p $(modulesdir) - -mkdir -p $(docdir) - -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)/ - -#ifdef SILC_DIST_SIM -sim-install: - -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ -#endif SILC_DIST_SIM - #ifdef SILC_DIST_CLIENT -install-dirs-client: install-dirs +install-dirs-client: + -mkdir -p $(etcdir) -mkdir -p $(helpdir) -mkdir -p $(mandir)/man1 -doc-install-client: doc-install +doc-install-client: $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf -@if test -f $(srcdir)/doc/silc.1 ; then \ $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \ @@ -87,69 +63,12 @@ etc-install-client: fi #endif SILC_DIST_CLIENT -#ifdef SILC_DIST_SERVER -install-dirs-server: install-dirs - -mkdir -p $(logsdir) - -mkdir -p $(mandir)/man5 - -mkdir -p $(mandir)/man8 - -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-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 - -examples-install: - -mkdir -p $(docdir)/examples/ - -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/ - -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/ - -generate-server-key: - -@if test '!' -f $(etcdir)/silcd.pub ; then \ - $(sbindir)/silcd -C $(etcdir); \ - fi -#endif SILC_DIST_SERVER - -#ifdef SILC_DIST_TOOLKIT -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 $(docdir) -#endif SILC_DIST_TOOLKIT - install-data-hook: \ #ifdef SILC_DIST_CLIENT install-dirs-client \ doc-install-client \ - etc-install-client \ + etc-install-client #endif SILC_DIST_CLIENT -#ifdef SILC_DIST_SERVER - install-dirs-server \ - doc-install-server \ - etc-install-server \ - examples-install \ - generate-server-key \ -#endif SILC_DIST_SERVER -#ifdef SILC_DIST_TOOLKIT - toolkit-install \ -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_SIM - sim-install -#endif SILC_DIST_SIM include $(top_srcdir)/Makefile.defines.in - #endif SILC_DIST_SILC diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am index 8f1c1122..0352ea87 100644 --- a/apps/silcd/Makefile.am +++ b/apps/silcd/Makefile.am @@ -41,4 +41,45 @@ LDADD = EXTRA_DIST = *.h +install-dirs-server: + -mkdir -p $(docdir) + -mkdir -p $(etcdir) + -mkdir -p $(logsdir) + -mkdir -p $(mandir)/man5 + -mkdir -p $(mandir)/man8 + +doc-install-server: + -$(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf $(docdir)/ + -@if test -f $(top_srcdir)/doc/silcd.8 ; then \ + $(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \ + fi + -@if test -f $(top_srcdir)/doc/silcd.conf.5 ; then \ + $(INSTALL_DATA) $(top_srcdir)/doc/silcd.conf.5 $(mandir)/man5; \ + fi + +etc-install-server: + -@if test '!' -f $(etcdir)/silcd.conf ; then \ + $(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf \ + $(etcdir)/silcd.conf; \ + $(INSTALL_DATA) $(top_srcdir)/doc/silcalgs.conf \ + $(etcdir)/silcalgs.conf; \ + chmod go= $(etcdir)/silcd.conf; \ + fi + +examples-install: + -mkdir -p $(docdir)/examples/ + -$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/ + +generate-server-key: + -@if test '!' -f $(etcdir)/silcd.pub ; then \ + $(sbindir)/silcd -C $(etcdir); \ + fi + +install-data-hook: \ + install-dirs-server \ + doc-install-server \ + etc-install-server \ + examples-install \ + generate-server-key + include $(top_srcdir)/Makefile.defines.in diff --git a/doc/Makefile.ad b/doc/Makefile.ad index 85e313cd..c7920dc6 100644 --- a/doc/Makefile.ad +++ b/doc/Makefile.ad @@ -84,6 +84,23 @@ dist-hook: touch draft-riikonen-presence-attrs-03.txt #endif SILC_DIST_TOOLKIT +doc-install: + -mkdir -p $(docdir) +#ifdef SILC_DIST_TOOLKIT + -$(INSTALL_DATA) $(top_srcdir)/doc/CodingStyle $(docdir)/ +#endif SILC_DIST_TOOLKIT + -$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/CHANGES $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/README* $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/ + +install-data-hook: \ + doc-install + EXTRA_DIST = \ #ifdef SILC_DIST_CLIENT silc.1 \ @@ -99,3 +116,5 @@ EXTRA_DIST = \ example_silcd.conf \ silcalgs.conf \ draft-riikonen*.txt + +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/Makefile.ad b/lib/Makefile.ad index c662a01b..4e1d1ca1 100644 --- a/lib/Makefile.ad +++ b/lib/Makefile.ad @@ -111,3 +111,17 @@ pkgconfig_DATA = silc.pc silcclient.pc EXTRA_DIST = silc.pc.in silcclient.pc.in #endif SILC_DIST_TOOLKIT +#ifdef SILC_DIST_TOOLKIT +toolkit-install: + -mkdir -p $(docdir)/toolkit/ + -$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit + -$(INSTALL_DATA) $(top_srcdir)/lib/doc/*.gif $(docdir)/toolkit + -cp -R $(top_srcdir)/tutorial $(docdir) +#endif SILC_DIST_TOOLKIT + +install-data-hook: \ +#ifdef SILC_DIST_TOOLKIT + toolkit-install +#endif SILC_DIST_TOOLKIT + +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcsim/Makefile.ad b/lib/silcsim/Makefile.ad index baf8d782..0c914975 100644 --- a/lib/silcsim/Makefile.ad +++ b/lib/silcsim/Makefile.ad @@ -80,4 +80,11 @@ include_HEADERS = silcsim.h silcsimutil.h EXTRA_DIST = *.h +# +# Installation +# +install-data-hook: + -mkdir -p $(modulesdir) + -$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.so $(modulesdir)/ + include $(top_srcdir)/Makefile.defines.in