diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-13 20:43:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-13 20:43:04 +0000 |
| commit | df2a7e5168337c5d71b57f7a8a5014d37823c48d (patch) | |
| tree | 1c5459583d4dc56b1dee0cc88cca898016c2a448 /pkgs/build-support | |
| parent | a93b037be89947d78292d98029c6fa004bc30a5a (diff) | |
* F-spot: work properly if an incompatible Mono is in the PATH.
svn path=/nixpkgs/trunk/; revision=2392
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/make-wrapper/make-wrapper.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh index 3b1833cf69e26..847db8910fd5b 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 |