[exim-cvs] cvs commit: exim/exim-src/OS Makefile-Base exim/…

Top Page
Delete this message
Reply to this message
Author: Tony Finch
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-src/OS Makefile-Base exim/exim-src/src exicyclog.src
fanf2 2009/01/20 16:06:14 GMT

  Modified files:
    exim-src/OS          Makefile-Base 
    exim-src/src         exicyclog.src 
  Log:
  Interpolate the configured paths of chmod and touch into exicyclog.
  Alphabetize the special commands.


  Revision  Changes    Path
  1.16      +3 -1      exim/exim-src/OS/Makefile-Base
  1.9       +3 -3      exim/exim-src/src/exicyclog.src


  Index: Makefile-Base
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/OS/Makefile-Base,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile-Base    14 Feb 2008 13:49:35 -0000    1.15
  +++ Makefile-Base    20 Jan 2009 16:06:14 -0000    1.16
  @@ -1,4 +1,4 @@
  -# $Cambridge: exim/exim-src/OS/Makefile-Base,v 1.15 2008/02/14 13:49:35 fanf2 Exp $
  +# $Cambridge: exim/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 @@
         -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


  Index: exicyclog.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exicyclog.src,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- exicyclog.src    28 Jul 2008 18:24:13 -0000    1.8
  +++ exicyclog.src    20 Jan 2009 16:06:14 -0000    1.9
  @@ -1,5 +1,5 @@
   #! /bin/sh
  -# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.8 2008/07/28 18:24:13 fanf2 Exp $
  +# $Cambridge: exim/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 @@
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 @@
# 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