From: Phil Pennock <pdp@exim.org>
Date: Mon, 24 Jan 2011 21:40:38 +0000 (-0500)
Subject: Bug-fix the xpg4 Solaris logic.
X-Git-Tag: exim-4_74^0
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/88d5edb00796448347da8544088b0db1f9b61ddf?hp=4050a04413dda769b60118e3bbb518639be6828a

Bug-fix the xpg4 Solaris logic.

Should not code at 9am when still awake then.
Should sanity-review such code changes before submitting (after sleep).
Should s,/usr/xpg4/bin/sh,/bin/bash, as a convenient test to confirm
what I suspected.  But should do so pre-submit.

Doh.
---

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 959d49e11..2c4dc96b8 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -2,13 +2,13 @@
 
 # We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile
 
-if [ -x /usr/xpg4/bin/sh ] && [ -z "EXIM_BLOCK_XPG4_LOOP" ]
+if [ -x /usr/xpg4/bin/sh ] && [ -z "$EXIM_BLOCK_XPG4_LOOP" ]
 then
   EXIM_BLOCK_XPG4_LOOP=yes
   export EXIM_BLOCK_XPG4_LOOP
   PATH="/usr/xpg4/bin:$PATH"
   export PATH
-  exec /usr/xpg4/bin/sh "$@"
+  exec /usr/xpg4/bin/sh "$0" "$@"
 fi
 
 input=lookups/Makefile.predynamic