From c40dee92783fd00e4d244b6e3a3bb88d5cde9a93 Mon Sep 17 00:00:00 2001
From: Tony Finch <dot@dot.at>
Date: Fri, 25 Jul 2008 20:39:55 +0000
Subject: [PATCH] OS-dependent locations for CHMOD_COMMAND, required by
 exicyclog (bug#602)

---
 src/OS/Makefile-DGUX         | 3 ++-
 src/OS/Makefile-Darwin       | 3 ++-
 src/OS/Makefile-DragonFly    | 3 ++-
 src/OS/Makefile-FreeBSD      | 3 ++-
 src/OS/Makefile-GNU          | 3 ++-
 src/OS/Makefile-GNUkFreeBSD  | 3 ++-
 src/OS/Makefile-GNUkNetBSD   | 3 ++-
 src/OS/Makefile-Linux        | 5 +++--
 src/OS/Makefile-NetBSD       | 4 +++-
 src/OS/Makefile-NetBSD-a.out | 4 +++-
 src/OS/Makefile-OpenBSD      | 4 +++-
 src/OS/Makefile-QNX          | 3 ++-
 src/OS/Makefile-SCO          | 3 ++-
 src/OS/Makefile-SCO_SV       | 3 ++-
 14 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/OS/Makefile-DGUX b/src/OS/Makefile-DGUX
index 11e5012f1..53ac92bd0 100644
--- a/src/OS/Makefile-DGUX
+++ b/src/OS/Makefile-DGUX
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-DGUX,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-DGUX,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for DGUX
 #
@@ -12,6 +12,7 @@
 BASENAME_COMMAND=/bin/basename
 CHOWN_COMMAND=/bin/chown
 CHGRP_COMMAND=/bin/chgrp
+CHMOD_COMMAND=/bin/chmod
 
 # PERL
 # Perl is not necessary for running Exim itself, but some Perl utilities
diff --git a/src/OS/Makefile-Darwin b/src/OS/Makefile-Darwin
index 01ca8a631..f52ce9d63 100644
--- a/src/OS/Makefile-Darwin
+++ b/src/OS/Makefile-Darwin
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-Darwin,v 1.2 2006/02/10 14:35:37 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-Darwin,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for Darwin (Mac OS X).
 
@@ -6,6 +6,7 @@ CC=cc
 
 BASENAME_COMMAND=look_for_it
 CHOWN_COMMAND=/usr/sbin/chown
+CHMOD_COMMAND=/bin/chmod
 
 HAVE_SA_LEN=YES
 
diff --git a/src/OS/Makefile-DragonFly b/src/OS/Makefile-DragonFly
index c5e9aac4b..baac9c6f1 100644
--- a/src/OS/Makefile-DragonFly
+++ b/src/OS/Makefile-DragonFly
@@ -1,10 +1,11 @@
-# $Cambridge: exim/src/OS/Makefile-DragonFly,v 1.1 2005/09/06 13:21:07 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-DragonFly,v 1.2 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for DragonFly
 # There's no setting of CFLAGS here, to allow the system default
 # for "make" to be the default.
 
 CHOWN_COMMAND=/usr/sbin/chown
+CHMOD_COMMAND=/bin/chmod
 
 HAVE_SA_LEN=YES
 
diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index 6bcef9b9d..0abd8086f 100644
--- a/src/OS/Makefile-FreeBSD
+++ b/src/OS/Makefile-FreeBSD
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.4 2006/04/19 11:15:43 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.5 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for FreeBSD
 # There's no setting of CFLAGS here, to allow the system default
@@ -8,6 +8,7 @@ PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 
 CHOWN_COMMAND=/usr/sbin/chown
 STRIP_COMMAND=/usr/bin/strip
+CHMOD_COMMAND=/bin/chmod
 
 HAVE_SA_LEN=YES
 
diff --git a/src/OS/Makefile-GNU b/src/OS/Makefile-GNU
index 6c8f30eae..933256384 100644
--- a/src/OS/Makefile-GNU
+++ b/src/OS/Makefile-GNU
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-GNU,v 1.4 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-GNU,v 1.5 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for GNU and variants.
 
@@ -7,6 +7,7 @@ HAVE_ICONV=yes
 BASENAME_COMMAND=look_for_it
 CHOWN_COMMAND=look_for_it
 CHGRP_COMMAND=look_for_it
+CHMOD_COMMAND=look_for_it
 
 CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
diff --git a/src/OS/Makefile-GNUkFreeBSD b/src/OS/Makefile-GNUkFreeBSD
index 305640cca..7bf6a9a5a 100644
--- a/src/OS/Makefile-GNUkFreeBSD
+++ b/src/OS/Makefile-GNUkFreeBSD
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-GNUkFreeBSD,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-GNUkFreeBSD,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for GNU and variants.
 
@@ -7,6 +7,7 @@ HAVE_ICONV=yes
 BASENAME_COMMAND=look_for_it
 CHOWN_COMMAND=look_for_it
 CHGRP_COMMAND=look_for_it
+CHMOD_COMMAND=look_for_it
 
 CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
diff --git a/src/OS/Makefile-GNUkNetBSD b/src/OS/Makefile-GNUkNetBSD
index 45cfc8b52..2d8cf3c67 100644
--- a/src/OS/Makefile-GNUkNetBSD
+++ b/src/OS/Makefile-GNUkNetBSD
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-GNUkNetBSD,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-GNUkNetBSD,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for GNU and variants.
 
@@ -7,6 +7,7 @@ HAVE_ICONV=yes
 BASENAME_COMMAND=look_for_it
 CHOWN_COMMAND=look_for_it
 CHGRP_COMMAND=look_for_it
+CHMOD_COMMAND=look_for_it
 
 CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
diff --git a/src/OS/Makefile-Linux b/src/OS/Makefile-Linux
index 94290f2b9..d07fed738 100644
--- a/src/OS/Makefile-Linux
+++ b/src/OS/Makefile-Linux
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-Linux,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-Linux,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for Linux. This is for modern Linuxes,
 # which use libc6.
@@ -8,8 +8,9 @@ HAVE_ICONV=yes
 BASENAME_COMMAND=look_for_it
 CHOWN_COMMAND=look_for_it
 CHGRP_COMMAND=look_for_it
+CHMOD_COMMAND=look_for_it
 
-CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS=-O -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
 DBMLIB = -ldb
 USE_DB = yes
diff --git a/src/OS/Makefile-NetBSD b/src/OS/Makefile-NetBSD
index 675345504..97f9a6d21 100644
--- a/src/OS/Makefile-NetBSD
+++ b/src/OS/Makefile-NetBSD
@@ -1,8 +1,10 @@
-# $Cambridge: exim/src/OS/Makefile-NetBSD,v 1.3 2007/06/27 08:46:28 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-NetBSD,v 1.4 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for NetBSD (ELF object format)
 
 CHOWN_COMMAND=/usr/sbin/chown
+CHMOD_COMMAND=/bin/chmod
+
 CFLAGS?=-O2
 
 HAVE_SA_LEN=YES
diff --git a/src/OS/Makefile-NetBSD-a.out b/src/OS/Makefile-NetBSD-a.out
index 91ad7a6f2..a8003fe66 100644
--- a/src/OS/Makefile-NetBSD-a.out
+++ b/src/OS/Makefile-NetBSD-a.out
@@ -1,8 +1,10 @@
-# $Cambridge: exim/src/OS/Makefile-NetBSD-a.out,v 1.3 2007/06/27 08:46:28 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-NetBSD-a.out,v 1.4 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
 
 CHOWN_COMMAND=/usr/sbin/chown
+CHMOD_COMMAND=/bin/chmod
+
 CFLAGS?=-O2
 
 HAVE_SA_LEN=YES
diff --git a/src/OS/Makefile-OpenBSD b/src/OS/Makefile-OpenBSD
index 755cd6847..6e231d0cf 100644
--- a/src/OS/Makefile-OpenBSD
+++ b/src/OS/Makefile-OpenBSD
@@ -1,9 +1,11 @@
-# $Cambridge: exim/src/OS/Makefile-OpenBSD,v 1.2 2005/09/13 09:43:17 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-OpenBSD,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for OpenBSD
 
 CHOWN_COMMAND=/usr/sbin/chown
 CHGRP_COMMAND=/usr/sbin/chgrp
+CHMOD_COMMAND=/bin/chmod
+
 CFLAGS=-O2 -Wall
 
 LIBS=-lm
diff --git a/src/OS/Makefile-QNX b/src/OS/Makefile-QNX
index 8c7375f9a..f64fa7aa7 100644
--- a/src/OS/Makefile-QNX
+++ b/src/OS/Makefile-QNX
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-QNX,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-QNX,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific makefile for QNX
 
@@ -7,6 +7,7 @@ MAKE_SHELL=/usr/bin/bash
 
 CHOWN_COMMAND=/bin/chown
 CHGRP_COMMAND=/bin/chgrp
+CHMOD_COMMAND=/bin/chmod
 HOSTNAME_COMMAND=/bin/hostname
 MV_COMMAND=/bin/mv
 PERL_COMMAND=/usr/bin/perl
diff --git a/src/OS/Makefile-SCO b/src/OS/Makefile-SCO
index d328b57cd..27327d702 100644
--- a/src/OS/Makefile-SCO
+++ b/src/OS/Makefile-SCO
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-SCO,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-SCO,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for SCO
 
@@ -23,6 +23,7 @@ X11_LD_LIB=$(X11)/lib
 BASENAME_COMMAND=/bin/basename
 CHOWN_COMMAND=/bin/chown
 CHGRP_COMMAND=/bin/chgrp
+CHMOD_COMMAND=/bin/chmod
 HOSTNAME_COMMAND=/usr/bin/hostname
 
 
diff --git a/src/OS/Makefile-SCO_SV b/src/OS/Makefile-SCO_SV
index 6d65862a3..ccc202d08 100644
--- a/src/OS/Makefile-SCO_SV
+++ b/src/OS/Makefile-SCO_SV
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-SCO_SV,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-SCO_SV,v 1.3 2008/07/25 20:39:55 fanf2 Exp $
 
 # Exim: OS-specific make file for SCO_SV release 5 (tested on 5.0.5 & 5.0.5)
 #       (see the UNIX_SV files for SCO 4.2)
@@ -29,6 +29,7 @@ X11_LD_LIB=$(X11)/lib
 BASENAME_COMMAND=/bin/basename
 CHOWN_COMMAND=/bin/chown
 CHGRP_COMMAND=/bin/chgrp
+CHMOD_COMMAND=/bin/chmod
 HOSTNAME_COMMAND=/usr/bin/hostname
 
 # End
-- 
2.30.2