From 9ba2b1fb4e032b87e7aceff7fd0406153381b7e6 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 2 Aug 2005 02:49:12 +0000 Subject: [PATCH] * Applied W. Goegens' dirconfig patch for more install targets --- citadel/ChangeLog | 4 +++ citadel/Makefile.in | 81 +++++++++++++++++++++++++++++++++++++++++++- citadel/configure.ac | 22 ++++++++++-- 3 files changed, 103 insertions(+), 4 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 062c356b0..a741fb9da 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ +Revision 653.14 2005/08/02 02:49:12 ajc +* Applied W. Goegens' dirconfig patch for more install targets + Revision 653.13 2005/08/01 20:45:26 ajc * citadel_ipc.c: RUN_DIR not RUNDIR in line 2944 @@ -6968,3 +6971,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/Makefile.in b/citadel/Makefile.in index e0bd45506..b4f5c1adc 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -14,7 +14,11 @@ TARGETS=@TARGETS@ CHKPWD=@CHKPWD@ - +RUN_DIR=@MAKE_RUN_DIR@ +SPOOL_DIR=@MAKE_SPOOL_DIR@ +ETC_DIR=@MAKE_ETC_DIR@ +DATA_DIR=@MAKE_DATA_DIR@ +DOC_DIR=@MAKE_DOC_DIR@ all: $(TARGETS) .SUFFIXES: .o .d .c @@ -181,6 +185,12 @@ install: install-exec install-data install-doc @echo Now go to your Citadel directory and run 'setup'. @echo +install-new: install-exec-new install-data-new install-doc-new + @echo + @echo Installation is complete. + @echo Now go to your Citadel directory and run 'setup'. + @echo + upgrade: install-exec install-doc @echo @echo Upgrade is complete. @@ -202,6 +212,33 @@ install-data: $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ fi +install-data-new: + @for i in network/spoolin network/spoolout network/systems; do \ + $(srcdir)/mkinstalldirs $(root)$(RUN_DIR)/$$i; \ + done + $(srcdir)/mkinstalldirs $(root)$(ETC_DIR)/ + $(INSTALL_DATA) $(srcdir)/public_clients $(root)$(ETC_DIR)/public_clients + $(INSTALL_DATA) $(srcdir)/citadel.rc $(root)$(ETC_DIR)/citadel.rc + $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(root)$(ETC_DIR)/mail.aliases$ + + $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/help + $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/messages + @for i in \ + `find $(srcdir)/help $(srcdir)/messages -type f | grep -v CVS`; do \ + echo $(INSTALL_DATA) $$i $(root)$(DATA_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(root)$(DATA_DIR)/$$i; \ + done + $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/spoolin + $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/spoolout + $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/systems + -@if test -d $(root)/etc/pam.d; then \ + echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ + $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ + fi + @for i in bio bitbucket files images info userpics; do \ + $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/$$i; \ + done + install-doc: @$(srcdir)/mkinstalldirs $(root)$(prefix)/docs @for i in `find $(srcdir)/docs -type f | grep -v CVS`; do \ @@ -216,6 +253,19 @@ install-doc: echo $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt +install-doc-new: + @$(srcdir)/mkinstalldirs $(root)$(DOC_DIR)/docs + @for i in `find $(srcdir)/docs -type f | grep -v CVS`; do \ + echo $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + done + @$(srcdir)/mkinstalldirs $(root)$(DOC_DIR)/techdoc + @for i in `find $(srcdir)/techdoc -type f | grep -v CVS`; do \ + echo $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + done + $(INSTALL_DATA) README.txt $(root)$(DOC_DIR)/README.txt + install-exec: all @for i in bio bitbucket files images info userpics; do \ $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \ @@ -237,6 +287,35 @@ install-exec: all chmod u+s $(root)$(prefix)/chkpwd; \ fi +install-exec-new: all + $(srcdir)/mkinstalldirs $(root)/usr/sbin; + $(srcdir)/mkinstalldirs $(root)/usr/bin; + $(srcdir)/mkinstalldirs $(root)$(DOC_DIR); + @for i in $(SERVER_TARGETS) $(UTIL_TARGETS); do \ + if test -f $$i; then \ + echo $(INSTALL) $$i $(root)/usr/sbin/$$i; \ + $(INSTALL) $$i $(root)/usr/sbin/$$i; \ + fi \ + done + + $(INSTALL) citmail $(root)/usr/sbin/sendmail; + @for i in $(CLIENT_TARGETS); do \ + if test -f $$i; then \ + echo $(INSTALL) $$i $(root)/usr/bin/$$i; \ + $(INSTALL) $$i $(root)/usr/bin/$$i; \ + fi \ + done + @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \ + if test -f $(srcdir)/$$i; then \ + echo $(INSTALL) $(srcdir)/$$i $(root)$(DOC_DIR)/$$i; \ + $(INSTALL) $(srcdir)/$$i $(root)$(DOC_DIR)/$$i; \ + fi \ + done + @if test x`find $(root)/usr/sbin/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \ + echo chmod u+s $(root)/usr/sbin/chkpwd; \ + chmod u+s $(root)usr/sbin/chkpwd; \ + fi + clean: rm -f *.o parsedate.c diff --git a/citadel/configure.ac b/citadel/configure.ac index 90b0b5e9e..b332cbc1e 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -17,6 +17,8 @@ AC_ARG_WITH(datadir, [ if test "x$withval" != "xno" ; then AC_DEFINE(HAVE_DATA_DIR) AC_DEFINE_UNQUOTED(DATA_DIR, "$withval") + MAKE_DATA_DIR=$withval + AC_SUBST(MAKE_DATA_DIR) fi ] ) @@ -27,18 +29,21 @@ AC_ARG_WITH(spooldir, [ if test "x$withval" != "xno" ; then AC_DEFINE(HAVE_SPOOL_DIR) AC_DEFINE_UNQUOTED(SPOOL_DIR,"$withval") + MAKE_SPOOL_DIR=$withval + AC_SUBST(MAKE_SPOOL_DIR) fi ] ) - dnl Checks for the Configdir AC_ARG_WITH(sysconfdir, [ --with-sysconfdir directory to store the configs under], [ if test "x$withval" != "xno" ; then AC_DEFINE(HAVE_ETC_DIR) AC_DEFINE_UNQUOTED(ETC_DIR, "$withval") + MAKE_ETC_DIR=$withval + AC_SUBST(MAKE_ETC_DIR) fi ] ) @@ -46,10 +51,12 @@ AC_ARG_WITH(sysconfdir, dnl Checks for the run-dir for the sockets AC_ARG_WITH(rundir, - [ --with-rundir directory to store the configs under], + [ --with-rundir directory to store the configs under], [ if test "x$withval" != "xno" ; then AC_DEFINE(HAVE_RUN_DIR) AC_DEFINE_UNQUOTED(RUN_DIR, "$withval") + MAKE_RUN_DIR=$withval + AC_SUBST(MAKE_RUN_DIR) fi ] ) @@ -58,7 +65,7 @@ AC_ARG_WITH(rundir, dnl Checks for the Pseudo Random Generator sockets TODO: this keeps being default. AC_DEFINE_UNQUOTED(EGD_POOL, "/var/run/egd-pool") AC_ARG_WITH(egdpool, - [ --with-egdpool the socket from Pseudo Random Generator, defaults to /var/run/egd-pool], + [ --with-egdpool the socket from Pseudo Random Generator, defaults to /var/run/egd-pool], [ if test "x$withval" != "xno" ; then AC_DEFINE_UNQUOTED(EGD_POOL, "$withval") fi @@ -66,6 +73,15 @@ AC_ARG_WITH(egdpool, ) +AC_ARG_WITH(docdir, + [ --with-docdir where to install the documentation. default: /usr/local/citadel/], + [ if test "x$withval" != "xno" ; then + MAKE_DOC_DIR=$withval + AC_SUBST(MAKE_DOC_DIR) + fi + ] +) + AC_ARG_ENABLE(autologin, [ --disable-autologin disable autologin (default is enabled if possible)]) -- 2.39.2