From df2a7e5168337c5d71b57f7a8a5014d37823c48d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Mar 2005 20:43:04 +0000
Subject: [PATCH] * F-spot: work properly if an incompatible Mono is in the
 PATH.

svn path=/nixpkgs/trunk/; revision=2392
---
 pkgs/applications/graphics/f-spot/builder.sh    | 8 ++++----
 pkgs/build-support/make-wrapper/make-wrapper.sh | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh
index 88ab8810e74..bf7d9244ce9 100644
--- a/pkgs/applications/graphics/f-spot/builder.sh
+++ b/pkgs/applications/graphics/f-spot/builder.sh
@@ -10,10 +10,10 @@ postInstall() {
         echo "wrapping $(basename $i)"
         # !!! TODO: figure out the MONO_GAC_PREFIX automatically
         makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix LD_LIBRARY_PATH ':' "$sqlite/lib" \
-            --suffix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp"
+            --prefix PATH ':' "$(dirname $(type -p mono))" \
+            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
+            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
+            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
     done
     
     # !!! hack
diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh
index 3b1833cf69e..847db8910fd 100644
--- a/pkgs/build-support/make-wrapper/make-wrapper.sh
+++ b/pkgs/build-support/make-wrapper/make-wrapper.sh
@@ -17,13 +17,17 @@ makeWrapper() {
             echo "export $varName=$value" >> $wrapper
         fi
 
-        if test "$p" = "--suffix"; then
+        if test "$p" = "--suffix" -o "$p" = "--prefix"; then
             varName=${params[$((n + 1))]}
             separator=${params[$((n + 2))]}
             value=${params[$((n + 3))]}
             n=$((n + 3))
             if test -n "$value"; then
-                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+                if test "$p" = "--suffix"; then
+                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+                else
+                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
+                fi
             fi
         fi