diff options
| author | Tony Finch <dot@dot.at> | 2009-01-20 16:06:14 +0000 |
|---|---|---|
| committer | Tony Finch <dot@dot.at> | 2009-01-20 16:06:14 +0000 |
| commit | 5c3a378fcb71aaf98785a642e9b46489232eeb79 (patch) | |
| tree | 04399788dd7e3d00c8e5b25eff81990654e1cd4e | |
| parent | 9b989985f96d57acea1fda778a439172134a9e10 (diff) | |
Interpolate the configured paths of chmod and touch into exicyclog.
Alphabetize the special commands.
| -rw-r--r-- | src/OS/Makefile-Base | 6 | ||||
| -rw-r--r-- | src/src/exicyclog.src | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index cc38cb1ee..e62f64ad8 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -1,4 +1,4 @@ -# $Cambridge: exim/src/OS/Makefile-Base,v 1.15 2008/02/14 13:49:35 fanf2 Exp $ +# $Cambridge: exim/src/OS/Makefile-Base,v 1.16 2009/01/20 16:06:14 fanf2 Exp $ # This file is the basis of the main makefile for Exim and friends. The # makefile at the top level arranges to build the main makefile by calling @@ -132,10 +132,12 @@ exicyclog: Makefile config.h ../src/exicyclog.src -e "s?EXICYCLOG_MAX?$(EXICYCLOG_MAX)?" \ -e "s?COMPRESS_COMMAND?$(COMPRESS_COMMAND)?" \ -e "s?COMPRESS_SUFFIX?$(COMPRESS_SUFFIX)?" \ - -e "s?CHOWN_COMMAND?$(CHOWN_COMMAND)?" \ -e "s?CHGRP_COMMAND?$(CHGRP_COMMAND)?" \ + -e "s?CHMOD_COMMAND?$(CHMOD_COMMAND)?" \ + -e "s?CHOWN_COMMAND?$(CHOWN_COMMAND)?" \ -e "s?MV_COMMAND?$(MV_COMMAND)?" \ -e "s?RM_COMMAND?$(RM_COMMAND)?" \ + -e "s?TOUCH_COMMAND?$(TOUCH_COMMAND)?" \ ../src/exicyclog.src > exicyclog-t @mv exicyclog-t exicyclog @chmod a+x exicyclog diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src index f10446339..c1af5d179 100644 --- a/src/src/exicyclog.src +++ b/src/src/exicyclog.src @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/src/exicyclog.src,v 1.8 2008/07/28 18:24:13 fanf2 Exp $ +# $Cambridge: exim/src/src/exicyclog.src,v 1.9 2009/01/20 16:06:14 fanf2 Exp $ # Copyright (c) 2006 University of Cambridge. # See the file NOTICE for conditions of use and distribution. @@ -53,12 +53,12 @@ keep=EXICYCLOG_MAX compress=COMPRESS_COMMAND suffix=COMPRESS_SUFFIX -chown=CHOWN_COMMAND chgrp=CHGRP_COMMAND chmod=CHMOD_COMMAND -touch=TOUCH_COMMAND +chown=CHOWN_COMMAND mv=MV_COMMAND rm=RM_COMMAND +touch=TOUCH_COMMAND # End of editable lines ######################################################################### @@ -84,7 +84,7 @@ done # in different places. We have a fudge that will search the usual suspects if # requested. -for cmd in chown chgrp chmod mv rm ; do +for cmd in chgrp chmod chown mv rm touch; do eval "oldcmd=\$$cmd" if [ "$oldcmd" != "look_for_it" ] ; then continue ; fi newcmd=$cmd |