git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: OpenSSL/LibreSSL version output variances
[users/jgh/exim.git]
/
src
/
OS
/
Makefile-Base
diff --git
a/src/OS/Makefile-Base
b/src/OS/Makefile-Base
index 96b19cbad3553f18948a4b625c87c2e5d831c8cc..dcd87c29cce19ba004100499d31f1840c4540ba9 100644
(file)
--- a/
src/OS/Makefile-Base
+++ b/
src/OS/Makefile-Base
@@
-5,7
+5,7
@@
# optional, Local/* files at the front of this file, to create Makefile in the
# build directory.
#
# optional, Local/* files at the front of this file, to create Makefile in the
# build directory.
#
-# Copyright (c) The Exim Maintainers 201
6
+# Copyright (c) The Exim Maintainers 201
7
SHELL = $(MAKE_SHELL)
SCRIPTS = ../scripts
SHELL = $(MAKE_SHELL)
SCRIPTS = ../scripts
@@
-36,9
+36,9
@@
FE = $(FULLECHO)
# are set up, and finally it goes to the main Exim target.
all: utils exim
# are set up, and finally it goes to the main Exim target.
all: utils exim
-config: $(EDITME) checklocalmake Makefile os.c config.h version.h macro.c
+config: $(EDITME) checklocalmake Makefile os.c config.h version.h
version.sh
macro.c
-checklocalmake:
+checklocalmake:
@if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \
$(SHELL) $(SCRIPTS)/newer $(EDITME)-$(ARCHTYPE) $(EDITME) || \
$(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE)-$(ARCHTYPE) $(EDITME); \
@if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \
$(SHELL) $(SCRIPTS)/newer $(EDITME)-$(ARCHTYPE) $(EDITME) || \
$(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE)-$(ARCHTYPE) $(EDITME); \
@@
-135,96
+135,100
@@
OBJ_MACRO = macro_predef.o \
macro-manualroute.o macro-queryprogram.o macro-redirect.o \
macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \
macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-tls.o\
macro-manualroute.o macro-queryprogram.o macro-redirect.o \
macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \
macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-tls.o\
+ macro-dkim.o
$(OBJ_MACRO): $(MACRO_HSRC)
macro_predef.o : macro_predef.c
$(OBJ_MACRO): $(MACRO_HSRC)
macro_predef.o : macro_predef.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
macro_predef.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
macro_predef.c
macro-globals.o : globals.c
macro-globals.o : globals.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
globals.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
globals.c
macro-readconf.o : readconf.c
macro-readconf.o : readconf.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
readconf.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
readconf.c
macro-route.o : route.c
macro-route.o : route.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
route.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
route.c
macro-transport.o: transport.c
macro-transport.o: transport.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transport.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transport.c
macro-drtables.o : drtables.c
macro-drtables.o : drtables.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
drtables.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
drtables.c
macro-appendfile.o : transports/appendfile.c
macro-appendfile.o : transports/appendfile.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/appendfile.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/appendfile.c
macro-autoreply.o : transports/autoreply.c
macro-autoreply.o : transports/autoreply.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/autoreply.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/autoreply.c
macro-lmtp.o: transports/lmtp.c
macro-lmtp.o: transports/lmtp.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/lmtp.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/lmtp.c
macro-pipe.o : transports/pipe.c
macro-pipe.o : transports/pipe.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/pipe.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/pipe.c
macro-queuefile.o : transports/queuefile.c
macro-queuefile.o : transports/queuefile.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/queuefile.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/queuefile.c
macro-smtp.o : transports/smtp.c
macro-smtp.o : transports/smtp.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
transports/smtp.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
transports/smtp.c
macro-accept.o : routers/accept.c
macro-accept.o : routers/accept.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/accept.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/accept.c
macro-dnslookup.o : routers/dnslookup.c
macro-dnslookup.o : routers/dnslookup.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/dnslookup.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/dnslookup.c
macro-ipliteral.o : routers/ipliteral.c
macro-ipliteral.o : routers/ipliteral.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/ipliteral.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/ipliteral.c
macro-iplookup.o : routers/iplookup.c
macro-iplookup.o : routers/iplookup.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/iplookup.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/iplookup.c
macro-manualroute.o : routers/manualroute.c
macro-manualroute.o : routers/manualroute.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/manualroute.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/manualroute.c
macro-queryprogram.o : routers/queryprogram.c
macro-queryprogram.o : routers/queryprogram.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/queryprogram.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/queryprogram.c
macro-redirect.o : routers/redirect.c
macro-redirect.o : routers/redirect.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
routers/redirect.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
routers/redirect.c
macro-auth-spa.o : auths/auth-spa.c
macro-auth-spa.o : auths/auth-spa.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/auth-spa.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/auth-spa.c
macro-cram_md5.o : auths/cram_md5.c
macro-cram_md5.o : auths/cram_md5.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/cram_md5.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/cram_md5.c
macro-cyrus_sasl.o : auths/cyrus_sasl.c
macro-cyrus_sasl.o : auths/cyrus_sasl.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/cyrus_sasl.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/cyrus_sasl.c
macro-dovecot.o: auths/dovecot.c
macro-dovecot.o: auths/dovecot.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/dovecot.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/dovecot.c
macro-gsasl_exim.o : auths/gsasl_exim.c
macro-gsasl_exim.o : auths/gsasl_exim.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/gsasl_exim.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/gsasl_exim.c
macro-heimdal_gssapi.o: auths/heimdal_gssapi.c
macro-heimdal_gssapi.o: auths/heimdal_gssapi.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/heimdal_gssapi.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/heimdal_gssapi.c
macro-plaintext.o : auths/plaintext.c
macro-plaintext.o : auths/plaintext.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/plaintext.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/plaintext.c
macro-spa.o : auths/spa.c
macro-spa.o : auths/spa.c
- @echo "$(CC) -DMACRO_PREDEF
$<
"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
$<
+ @echo "$(CC) -DMACRO_PREDEF
auths/spa.c
"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@
auths/spa.c
macro-tls.o: auths/tls.c
macro-tls.o: auths/tls.c
- @echo "$(CC) -DMACRO_PREDEF $<"
- $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+ @echo "$(CC) -DMACRO_PREDEF auths/tls.c"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
+macro-dkim.o: dkim.c
+ @echo "$(CC) -DMACRO_PREDEF dkim.c"
+ $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ dkim.c
macro_predef: $(OBJ_MACRO)
macro_predef: $(OBJ_MACRO)
- @echo "$(LNCC) -o $
<
"
+ @echo "$(LNCC) -o $
@
"
$(FE)$(LNCC) -o $@ $(LFLAGS) $(OBJ_MACRO)
macro.c: macro_predef
$(FE)$(LNCC) -o $@ $(LFLAGS) $(OBJ_MACRO)
macro.c: macro_predef
@@
-256,7
+260,7
@@
buildconfig: buildconfig.c
# Target for the exicyclog utility script
exicyclog: config ../src/exicyclog.src
@rm -f exicyclog
# Target for the exicyclog utility script
exicyclog: config ../src/exicyclog.src
@rm -f exicyclog
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
@@
-273,6
+277,8
@@
exicyclog: config ../src/exicyclog.src
-e "s?MV_COMMAND?$(MV_COMMAND)?" \
-e "s?RM_COMMAND?$(RM_COMMAND)?" \
-e "s?TOUCH_COMMAND?$(TOUCH_COMMAND)?" \
-e "s?MV_COMMAND?$(MV_COMMAND)?" \
-e "s?RM_COMMAND?$(RM_COMMAND)?" \
-e "s?TOUCH_COMMAND?$(TOUCH_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exicyclog.src > exicyclog-t
@mv exicyclog-t exicyclog
@chmod a+x exicyclog
../src/exicyclog.src > exicyclog-t
@mv exicyclog-t exicyclog
@chmod a+x exicyclog
@@
-281,13
+287,15
@@
exicyclog: config ../src/exicyclog.src
# Target for the exinext utility script
exinext: config ../src/exinext.src
@rm -f exinext
# Target for the exinext utility script
exinext: config ../src/exinext.src
@rm -f exinext
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?CONFIGURE_FILE_USE_NODE?$(CONFIGURE_FILE_USE_NODE)?" \
-e "s?CONFIGURE_FILE?$(CONFIGURE_FILE)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?CONFIGURE_FILE_USE_NODE?$(CONFIGURE_FILE_USE_NODE)?" \
-e "s?CONFIGURE_FILE?$(CONFIGURE_FILE)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exinext.src > exinext-t
@mv exinext-t exinext
@chmod a+x exinext
../src/exinext.src > exinext-t
@mv exinext-t exinext
@chmod a+x exinext
@@
-296,7
+304,7
@@
exinext: config ../src/exinext.src
# Target for the exiwhat utility script
exiwhat: config ../src/exiwhat.src
@rm -f exiwhat
# Target for the exiwhat utility script
exiwhat: config ../src/exiwhat.src
@rm -f exiwhat
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
@@
-309,6
+317,8
@@
exiwhat: config ../src/exiwhat.src
-e "s?EXIWHAT_EGREP_ARG?$(EXIWHAT_EGREP_ARG)?" \
-e "s?EXIWHAT_MULTIKILL_CMD?$(EXIWHAT_MULTIKILL_CMD)?" \
-e "s?EXIWHAT_MULTIKILL_ARG?$(EXIWHAT_MULTIKILL_ARG)?" \
-e "s?EXIWHAT_EGREP_ARG?$(EXIWHAT_EGREP_ARG)?" \
-e "s?EXIWHAT_MULTIKILL_CMD?$(EXIWHAT_MULTIKILL_CMD)?" \
-e "s?EXIWHAT_MULTIKILL_ARG?$(EXIWHAT_MULTIKILL_ARG)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exiwhat.src > exiwhat-t
@mv exiwhat-t exiwhat
@chmod a+x exiwhat
../src/exiwhat.src > exiwhat-t
@mv exiwhat-t exiwhat
@chmod a+x exiwhat
@@
-317,7
+327,7
@@
exiwhat: config ../src/exiwhat.src
# Target for the exim_checkaccess utility script
exim_checkaccess: config ../src/exim_checkaccess.src
@rm -f exim_checkaccess
# Target for the exim_checkaccess utility script
exim_checkaccess: config ../src/exim_checkaccess.src
@rm -f exim_checkaccess
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
@@
-325,6
+335,8
@@
exim_checkaccess: config ../src/exim_checkaccess.src
-e "s?CONFIGURE_FILE?$(CONFIGURE_FILE)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?CONFIGURE_FILE?$(CONFIGURE_FILE)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exim_checkaccess.src > exim_checkaccess-t
@mv exim_checkaccess-t exim_checkaccess
@chmod a+x exim_checkaccess
../src/exim_checkaccess.src > exim_checkaccess-t
@mv exim_checkaccess-t exim_checkaccess
@chmod a+x exim_checkaccess
@@
-335,7
+347,7
@@
eximon: config ../src/eximon.src ../OS/eximon.conf-Default \
../Local/eximon.conf
@rm -f eximon
$(SHELL) $(SCRIPTS)/Configure-eximon
../Local/eximon.conf
@rm -f eximon
$(SHELL) $(SCRIPTS)/Configure-eximon
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
@@
-345,85
+357,108
@@
eximon: config ../src/eximon.src ../OS/eximon.conf-Default \
-e "s?BASENAME_COMMAND?$(BASENAME_COMMAND)?" \
-e "s?HOSTNAME_COMMAND?$(HOSTNAME_COMMAND)?" \
-e "s?X11_LD_LIBRARY?$(X11_LD_LIB)?" \
-e "s?BASENAME_COMMAND?$(BASENAME_COMMAND)?" \
-e "s?HOSTNAME_COMMAND?$(HOSTNAME_COMMAND)?" \
-e "s?X11_LD_LIBRARY?$(X11_LD_LIB)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/eximon.src >> eximon
@echo ">>> eximon script built"; echo ""
# Targets for utilities; these are all Perl scripts that have to get the
# location of Perl put in them. A few need other things as well.
../src/eximon.src >> eximon
@echo ">>> eximon script built"; echo ""
# Targets for utilities; these are all Perl scripts that have to get the
# location of Perl put in them. A few need other things as well.
-exigrep:
Makefile
../src/exigrep.src
+exigrep:
config
../src/exigrep.src
@rm -f exigrep
@rm -f exigrep
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?ZCAT_COMMAND?$(ZCAT_COMMAND)?" \
-e "s?COMPRESS_SUFFIX?$(COMPRESS_SUFFIX)?" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?ZCAT_COMMAND?$(ZCAT_COMMAND)?" \
-e "s?COMPRESS_SUFFIX?$(COMPRESS_SUFFIX)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exigrep.src > exigrep-t
@mv exigrep-t exigrep
@chmod a+x exigrep
@echo ">>> exigrep script built"
../src/exigrep.src > exigrep-t
@mv exigrep-t exigrep
@chmod a+x exigrep
@echo ">>> exigrep script built"
-eximstats:
Makefile
../src/eximstats.src
+eximstats:
config
../src/eximstats.src
@rm -f eximstats
@rm -f eximstats
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/eximstats.src > eximstats-t
@mv eximstats-t eximstats
@chmod a+x eximstats
@echo ">>> eximstats script built"
../src/eximstats.src > eximstats-t
@mv eximstats-t eximstats
@chmod a+x eximstats
@echo ">>> eximstats script built"
-exiqgrep:
Makefile
../src/exiqgrep.src
+exiqgrep:
config
../src/exiqgrep.src
@rm -f exiqgrep
@rm -f exiqgrep
- @sed \
+ @
. ./version.sh &&
sed \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?PROCESSED_FLAG?This file has been so processed.?"\
-e "/^# /p" \
-e "/^# /d" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exiqgrep.src > exiqgrep-t
@mv exiqgrep-t exiqgrep
@chmod a+x exiqgrep
@echo ">>> exiqgrep script built"
../src/exiqgrep.src > exiqgrep-t
@mv exiqgrep-t exiqgrep
@chmod a+x exiqgrep
@echo ">>> exiqgrep script built"
-exiqsumm:
Makefile
../src/exiqsumm.src
+exiqsumm:
config
../src/exiqsumm.src
@rm -f exiqsumm
@rm -f exiqsumm
- @sed -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ @. ./version.sh && sed \
+ -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exiqsumm.src > exiqsumm-t
@mv exiqsumm-t exiqsumm
@chmod a+x exiqsumm
@echo ">>> exiqsumm script built"
../src/exiqsumm.src > exiqsumm-t
@mv exiqsumm-t exiqsumm
@chmod a+x exiqsumm
@echo ">>> exiqsumm script built"
-exipick:
Makefile
../src/exipick.src
+exipick:
config
../src/exipick.src
@rm -f exipick
@rm -f exipick
- @sed -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ @. ./version.sh && sed \
+ -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-e "s?SPOOL_DIRECTORY?$(SPOOL_DIRECTORY)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
-e "s?SPOOL_DIRECTORY?$(SPOOL_DIRECTORY)?" \
-e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/exipick.src > exipick-t
@mv exipick-t exipick
@chmod a+x exipick
@echo ">>> exipick script built"
../src/exipick.src > exipick-t
@mv exipick-t exipick
@chmod a+x exipick
@echo ">>> exipick script built"
-transport-filter.pl:
Makefile
../src/transport-filter.src
+transport-filter.pl:
config
../src/transport-filter.src
@rm -f transport-filter.pl
@rm -f transport-filter.pl
- @sed -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ @. ./version.sh && sed \
+ -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/transport-filter.src > transport-filter.pl-t
@mv transport-filter.pl-t transport-filter.pl
@chmod a+x transport-filter.pl
@echo ">>> transport-filter.pl script built"
../src/transport-filter.src > transport-filter.pl-t
@mv transport-filter.pl-t transport-filter.pl
@chmod a+x transport-filter.pl
@echo ">>> transport-filter.pl script built"
-convert4r3:
Makefile
../src/convert4r3.src
+convert4r3:
config
../src/convert4r3.src
@rm -f convert4r3
@rm -f convert4r3
- @sed -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ @. ./version.sh && sed \
+ -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/convert4r3.src > convert4r3-t
@mv convert4r3-t convert4r3
@chmod a+x convert4r3
@echo ">>> convert4r3 script built"
../src/convert4r3.src > convert4r3-t
@mv convert4r3-t convert4r3
@chmod a+x convert4r3
@echo ">>> convert4r3 script built"
-convert4r4:
Makefile
../src/convert4r4.src
+convert4r4:
config
../src/convert4r4.src
@rm -f convert4r4
@rm -f convert4r4
- @sed -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ @. ./version.sh && sed \
+ -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+ -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+ -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
../src/convert4r4.src > convert4r4-t
@mv convert4r4-t convert4r4
@chmod a+x convert4r4
../src/convert4r4.src > convert4r4-t
@mv convert4r4-t convert4r4
@chmod a+x convert4r4
@@
-631,7
+666,7
@@
PHDRS = ../config.h \
# Update Exim's version information and build the version object.
# Update Exim's version information and build the version object.
-version.h::
+version.h
version.sh
::
@../scripts/reversion
cnumber.h: version.h
@../scripts/reversion
cnumber.h: version.h
git://git.exim.org / users / jgh / exim.git / blobdiff