ph10 2005/09/12 14:50:04 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS Makefile
exim-src/OS Makefile-Base
exim-src/src/auths Makefile
exim-src/src/lookups Makefile
exim-src/src/routers Makefile
exim-src/src/transports Makefile
Log:
Use RM_COMMAND everywhere during building.
Revision Changes Path
1.221 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.34 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.3 +4 -3 exim/exim-src/Makefile
1.8 +5 -5 exim/exim-src/OS/Makefile-Base
1.3 +2 -2 exim/exim-src/src/auths/Makefile
1.5 +2 -2 exim/exim-src/src/lookups/Makefile
1.3 +2 -2 exim/exim-src/src/routers/Makefile
1.3 +2 -2 exim/exim-src/src/transports/Makefile
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog 12 Sep 2005 13:39:31 -0000 1.220
+++ ChangeLog 12 Sep 2005 13:50:03 -0000 1.221
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.220 2005/09/12 13:39:31 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.221 2005/09/12 13:50:03 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -161,6 +161,8 @@
PH/39 Added a new log selector, "unknown_in_list", which provokes a log entry
when the result of a list match is failure because a DNS lookup failed.
+
+PH/40 RM_COMMAND is now used in the building process.
Exim version 4.52
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ACKNOWLEDGMENTS 6 Sep 2005 13:17:36 -0000 1.33
+++ ACKNOWLEDGMENTS 12 Sep 2005 13:50:03 -0000 1.34
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.33 2005/09/06 13:17:36 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.34 2005/09/12 13:50:03 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 06 September 2005
+Last updated: 12 September 2005
THE OLD LIST
@@ -152,6 +152,7 @@
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
+Bryan Henderson Patch to use RM_COMMAND everywhere during building
Jakob Hirsch Patch for % operator
Kjetil Torgrim Homme Patch for require_files problem on NFS file systems
Tom Hughes Suggested patch for $n bug in pipe command from filter
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 11 Oct 2004 13:24:19 -0000 1.2
+++ Makefile 12 Sep 2005 13:50:03 -0000 1.3
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/Makefile,v 1.2 2004/10/11 13:24:19 ph10 Exp $
+# $Cambridge: exim/exim-src/Makefile,v 1.3 2005/09/12 13:50:03 ph10 Exp $
# Top-level makefile for Exim; handles creating a build directory with
# appropriate links, and then creating and running the main makefile in that
@@ -13,6 +13,7 @@
# or "make" must be called with a different SHELL= setting.
SHELL=/bin/sh
+RM_COMMAND=/bin/rm
# If a build name has not been specified by running this make file via a
# command of the form "make build=xxxx", then determine the name of the
@@ -58,7 +59,7 @@
# "configure", which doesn't force it).
makefile: build-directory
- @cd build-$(buildname); /bin/rm -f Makefile; \
+ @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
build=$(build) $(SHELL) ../scripts/Configure-Makefile
# Go to the build directory and do the business
@@ -77,12 +78,12 @@
@echo '*** Use "make makefile" to force a rebuild of the makefile'
@echo ""
cd build-$(buildname); \
- /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+ $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
routers/*.o routers/*.a transports/*.o transports/*.a \
pcre/*.o pcre/*.a
clean_exim:; cd build-$(buildname); \
- /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+ $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
routers/*.o routers/*.a transports/*.o transports/*.a
# End of top-level makefile
Index: Makefile-Base
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/Makefile-Base,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile-Base 27 Jun 2005 10:24:43 -0000 1.7
+++ Makefile-Base 12 Sep 2005 13:50:03 -0000 1.8
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/OS/Makefile-Base,v 1.7 2005/06/27 10:24:43 ph10 Exp $
+# $Cambridge: exim/exim-src/OS/Makefile-Base,v 1.8 2005/09/12 13:50:03 ph10 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
@@ -655,7 +655,7 @@
buildpcre:
@(cd pcre; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" \
FE="$(FE)" CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" \
- RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)")
@if $(SHELL) $(SCRIPTS)/newer pcre/libpcre.a exim; then \
rm -f exim eximon.bin; fi
@@ -665,7 +665,7 @@
buildlookups:
@cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \
echo " "
@@ -673,7 +673,7 @@
buildrouters:
@cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
@@ -681,7 +681,7 @@
buildtransports:
@cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
@@ -689,7 +689,7 @@
buildauths:
@cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/auths/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 17 May 2005 09:53:34 -0000 1.2
+++ Makefile 12 Sep 2005 13:50:03 -0000 1.3
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/auths/Makefile,v 1.2 2005/05/17 09:53:34 ph10 Exp $
+# $Cambridge: exim/exim-src/src/auths/Makefile,v 1.3 2005/09/12 13:50:03 ph10 Exp $
# Make file for building a library containing all the available authorization
# methods, and calling it auths.a. In addition, there are functions that are
@@ -12,11 +12,11 @@
cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o
auths.a: $(OBJ)
- @/bin/rm -f auths.a
+ @$(RM_COMMAND) -f auths.a
@echo "$(AR) auths.a"
$(FE)$(AR) auths.a $(OBJ)
$(RANLIB) $@
- @/bin/rm -rf ../drtables.o
+ @$(RM_COMMAND) -rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/lookups/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 1 Aug 2005 13:20:28 -0000 1.4
+++ Makefile 12 Sep 2005 13:50:03 -0000 1.5
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/lookups/Makefile,v 1.4 2005/08/01 13:20:28 ph10 Exp $
+# $Cambridge: exim/exim-src/src/lookups/Makefile,v 1.5 2005/09/12 13:50:03 ph10 Exp $
# Make file for building a library containing all the available lookups and
# calling it lookups.a. This is called from the main make file, after cd'ing
@@ -10,11 +10,11 @@
lf_check_file.o lf_quote.o
lookups.a: $(OBJ)
- @/bin/rm -f lookups.a
+ @$(RM_COMMAND) -f lookups.a
@echo "$(AR) lookups.a"
@$(AR) lookups.a $(OBJ)
$(RANLIB) $@
- @/bin/rm -rf ../drtables.o
+ @$(RM_COMMAND) -rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/routers/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 17 May 2005 09:53:35 -0000 1.2
+++ Makefile 12 Sep 2005 13:50:03 -0000 1.3
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/routers/Makefile,v 1.2 2005/05/17 09:53:35 ph10 Exp $
+# $Cambridge: exim/exim-src/src/routers/Makefile,v 1.3 2005/09/12 13:50:03 ph10 Exp $
# Make file for building a library containing all the available routers and
# calling it routers.a. This is called from the main make file, after cd'ing
@@ -14,11 +14,11 @@
rf_set_ugid.o
routers.a: $(OBJ)
- @/bin/rm -f routers.a
+ @$(RM_COMMAND) -f routers.a
@echo "$(AR) routers.a"
@$(AR) routers.a $(OBJ)
$(RANLIB) $@
- @/bin/rm -rf ../drtables.o
+ @$(RM_COMMAND) -rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 17 May 2005 09:53:35 -0000 1.2
+++ Makefile 12 Sep 2005 13:50:04 -0000 1.3
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/transports/Makefile,v 1.2 2005/05/17 09:53:35 ph10 Exp $
+# $Cambridge: exim/exim-src/src/transports/Makefile,v 1.3 2005/09/12 13:50:04 ph10 Exp $
# Make file for building a library containing all the available transports and
# calling it transports.a. This is called from the main make file, after cd'ing
@@ -7,11 +7,11 @@
OBJ = appendfile.o autoreply.o lmtp.o pipe.o smtp.o tf_maildir.o
transports.a: $(OBJ)
- @/bin/rm -f transports.a
+ @$(RM_COMMAND) -f transports.a
@echo "$(AR) transports.a"
@$(AR) transports.a $(OBJ)
$(RANLIB) $@
- @/bin/rm -rf ../drtables.o
+ @$(RM_COMMAND) -rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
