X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0cc9542ab26b35cba3a5523acb8991eb18ce0656..28c6059071a8c9db89aa34c70e9a4b0dc4000f26:/src/scripts/lookups-Makefile diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile index d5c450e4f..cd0a51b34 100755 --- a/src/scripts/lookups-Makefile +++ b/src/scripts/lookups-Makefile @@ -2,13 +2,29 @@ # We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile -if [ -x /usr/xpg4/bin/sh ] && [ -z "$EXIM_BLOCK_XPG4_LOOP" ] +# We always re-exec ourselves at least once, because it's the cleanest and +# most portable way to turn on various features we expect of POSIX sh. +if [ -z "$EXIM_LOOKUP_MAKEFILE_ADJUSTED" ] then - EXIM_BLOCK_XPG4_LOOP=yes - export EXIM_BLOCK_XPG4_LOOP - PATH="/usr/xpg4/bin:$PATH" - export PATH - exec /usr/xpg4/bin/sh "$0" "$@" + SHELL=/bin/sh + EXIM_LOOKUP_MAKEFILE_ADJUSTED=yes + export EXIM_LOOKUP_MAKEFILE_ADJUSTED + + # Solaris sh and tr are problematic until we get xpg4 variants + if [ -x /usr/xpg4/bin/sh ] + then + PATH="/usr/xpg4/bin:$PATH" + export PATH + SHELL=/usr/xpg4/bin/sh + export SHELL + fi + + # IRIX uses /bin/ksh for sh but in a compatibility mode unless $_XPG == 1, + # where said compatibility mode disables $(...) + _XPG=1 + export _XPG + + exec "$SHELL" "$0" "$@" fi input=lookups/Makefile.predynamic @@ -18,8 +34,12 @@ tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE' tab=' ' -# We always do something now, since there should always be a lookup, -# and now we need to run in order to put the OBJ=$(OBJ)+ rules in. +# We rely on tr(1) for translating case below. Some people export +# values of LC_CTYPE and LC_COLLATE which apparently break our assumptions. +# We're a script expecting certain output based on known inputs and not dealing +# with UTF8, so we should be safe doingthis: +LC_ALL=C +export LC_ALL # nb: do not permit leading whitespace for this, as CFLAGS_DYNAMIC is exported # to the lookups subdir via a line with leading whitespace which otherwise @@ -31,6 +51,9 @@ then else echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup" enable_dynamic='' + # We always do something now, since there should always be a lookup, + # and now we need to run in order to put the OBJ=$(OBJ)+ rules in. So we + # continue on. fi tmp="$target.t"