Added --enable-no-vixie-clobber to configure.ac.

3 files changed, 47 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index c47a49e..049faf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2008-02-21  Dale Mellor  <Dale Mellor <dale_mellor@users.sourceforge.net>
+2010-06-13  Dale Mellor <dale_mellor@users.sourceforge.net>
+
+	* configure.ac: added --enable-no-vixie-clobber argument to
+	configure so that the root user can avoid overwriting a legacy
+	cron installation.
+
+	* mcron.1: added simple, minimal man page using help2man (the
+	texinfo file is still the primary documentation source).
+
+	* makefile.am: replaced use of mkinstalldirs with install; the
+	former is not supplied with the latest automake (1.11).
+
+
+2008-02-21  Dale Mellor <dale_mellor@users.sourceforge.net>
 
 	* ALL FILES: Replaced version 2 GPL notices with version 3 ones.
 
@@ -8,12 +21,13 @@
 
 	* configure.ac: Bumped version to 1.0.4.
 
-2008-01-25  Dale Mellor  <Dale Mellor <dale_mellor@users.sourceforge.net>
+
+2008-01-25  Dale Mellor <dale_mellor@users.sourceforge.net>
 
 	* main.scm (command-type): Files which are listed on the command
 	line are assumed to be guile configurations if they do not end in
 	.guile or .vixie (previously they were silently ignored).
-	
+
 	* main.scm: Argument to --schedule is no longer optional (the
 	options system goes really screwy with optional values, usually
 	pulling the first non-option argument as a value if one was not
@@ -24,9 +38,9 @@
 	AM_PROGS_CC_C_O in configure.ac (!)
 
 	* Version is currently at 1.0.3.
-	
 
-2005-09-02  hydro23  <Dale Mellor <dale_mellor@users.sourceforge.net>
+
+2005-09-02  Dale Mellor <dale_mellor@users.sourceforge.net>
 
 	* makefile.am, mcron.c.template (main): Modified install-exec-hook
 	so that a proper installation of a Vixie-compatible cron only
@@ -41,7 +55,7 @@
 	laptop awakes from suspend mode).
 
 	* Bumped version to 1.0.2.
-	
+
 
 2004-05-15  Dale Mellor <dale_mellor@users.sourceforge.net>
 
@@ -49,7 +63,7 @@
 	properly homed at www.gnu.org.
 
 	* Bumped version to 1.0.1.
-	
+
 
 2003-12-11  Dale Mellor <dale_mellor@users.sourceforge.net>
 
@@ -58,7 +72,7 @@
 
 	* Bumped version to 1.0.0.
 
-	
+
 2003-12-07  Dale Mellor <dale_mellor@users.sourceforge.net>
 
 	* configure.ac: Added switches for files and directories used by
@@ -67,24 +81,24 @@
 	these configure options (including the source for the texinfo
 	manual).
 
-	
+
 2003-12-05  Dale Mellor <dale_mellor@users.sourceforge.net>
 
 	* configure.ac: Added test for guile version >= 1.6.4.
 
 	* bumped version to 0.99.4.
 
-	
+
 2003-08-03  Dale Mellor <dale_mellor@users.sourceforge.net>
 
         * Third cut, fully functional, modular, production quality, still
 	needs testing...
-	
+
 	* Pulled all functionality into modules, so it can be incorporated
 	into other programs.
 
 	* Bumped version to 0.99.3.
-	
+
 
 2003-07-20  Dale Mellor <dale_mellor@users.sourceforge.net>
 
@@ -111,7 +125,7 @@
 
 	* Broken/incomplete Guile prevents vixie compatibility from
 	working - this has been disabled by default in the configuration.
-	
+
 	* Version set at 0.99.1
 
 
diff --git a/configure.ac b/configure.ac
index 3253535..aef53f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,18 @@ fi
 SENDMAIL=$ac_cv_prog_SENDMAIL
 
 
+# Find out if we are avoiding Vixie.
+
+AC_MSG_CHECKING([whether to avoid clobbering a Vixie installation])
+AC_ARG_ENABLE(no-vixie-clobber,
+              AC_HELP_STRING([--enable-no-vixie-clobber],
+                             [do not install with program names that would override a legacy cron installation]),
+              NO_VIXIE_CLOBBER=$enableval,
+              NO_VIXIE_CLOBBER=[no])
+AC_MSG_RESULT($NO_VIXIE_CLOBBER)
+AC_SUBST(NO_VIXIE_CLOBBER)
+
+
 # Configure the various files that mcron uses at runtime.
 
 AC_MSG_CHECKING([which spool directory to use])
diff --git a/makefile.am b/makefile.am
index dee61af..8953729 100644
--- a/makefile.am
+++ b/makefile.am
@@ -50,12 +50,12 @@ pkgdata_DATA = core.scm environment.scm job-specifier.scm redirect.scm \
 # of this).
 
 core.scm : mcron-core.scm
-    $(CP) mcron-core.scm core.scm
+	$(CP) mcron-core.scm core.scm
 
 mcron.c : main.scm crontab.scm makefile.ed mcron.c.template
-    @echo 'Building mcron.c...'
-    @$(ED) < makefile.ed > /dev/null 2>&1
-    @rm -f mcron.escaped.scm > /dev/null 2>&1
+	@echo 'Building mcron.c...'
+	@$(ED) < makefile.ed > /dev/null 2>&1
+	@rm -f mcron.escaped.scm > /dev/null 2>&1
 
 
 #full program prefix
@@ -63,7 +63,7 @@ fpp = $(DESTDIR)$(bindir)/@real_program_prefix@
 
 
 install-exec-hook:
-    @if [ "`id -u`" -eq "0" ]; then \
+	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes"   -a   "`id -u`" -eq "0" ]; then \
        rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
        $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
        rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
@@ -72,12 +72,14 @@ install-exec-hook:
        $(INSTALL) -d --mode='u=rwx,og=rx' /var/run; \
        $(INSTALL) -d --mode='u=rwx,og=rx' @GUILE_SITE@; \
        $(INSTALL) -d --mode='u=rwx,og=rx' @GUILE_SITE@/mcron; \
+    elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
+       echo "Not installing Vixie-style programs"; \
     else \
        echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
     fi
 
 
 uninstall-hook:
-    if [ "`id -u`" -eq "0" ]; then \
+	if [ "`id -u`" -eq "0" ]; then \
         rm -f $(fpp){cron,crontab}$(EXEEXT); \
     fi