From 6c58c6f731726cfca3742a8ddcbde85ec37bf83c Mon Sep 17 00:00:00 2001
From: Craig Silverstein <csilvers@khanacademy.org>
Date: Tue, 10 Jun 2008 00:52:08 +0000
Subject: Apparently, for freebsd's sh at least, "eval FOO=a bar" lets bar see
 FOO=a, while "FOO=a eval bar" does not.  So change from the latter
 formulation to the former.

Tested by running 'make pump-maintainer-check' on freebsd and on linux
(ubuntu).

Reviewed by klarlund
---
 pump.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pump.in b/pump.in
index d9d61d5..9fe8bbf 100755
--- a/pump.in
+++ b/pump.in
@@ -275,14 +275,15 @@ StartIncludeServer() {
     #
     # which will pass '*' to the include server (that is, the string consisting
     # of one asterisk) without filename expansion.
-    PYTHONOPTIMIZE=$PYTHONOPTIMIZE \
-    PYTHONPATH="$pythonpath::$PYTHONPATH" \
-    eval "'$PYTHON'"                   \
-        "'$include_server'"            \
-        --port "'$socket'"             \
-        --pid_file "'$tmp_pid_file'"   \
-        -d1                            \
-        $INCLUDE_SERVER_ARGS
+    eval \
+      PYTHONOPTIMIZE=$PYTHONOPTIMIZE    \
+      PYTHONPATH="$pythonpath::$PYTHONPATH" \
+      "'$PYTHON'"                       \
+         "'$include_server'"            \
+         --port "'$socket'"             \
+         --pid_file "'$tmp_pid_file'"   \
+         -d1                            \
+         $INCLUDE_SERVER_ARGS
   )
 
   # solaris sh's built-in test does not support -S, so we need to use
-- 
cgit v1.2.1