[ooo-build-commit] patches/mono

[Tor Lillqvist]

 patches/mono/mono-climaker.diff |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5250c0fd8dc8399e969e711152166aee0acc003d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 17:20:19 2009 +0300

    Fix mono climaker stuff
    
    Now with solver/foo/bar/bin no longer being in PATH, we need to
    explcitly run climaker from where it is. Also need to set
    LD_LIBRARY_PATH so that libclimaker.so is found.

diff --git a/patches/mono/mono-climaker.diff b/patches/mono/mono-climaker.diff
index fa6955c..b69c2f8 100644
--- a/patches/mono/mono-climaker.diff
+++ b/patches/mono/mono-climaker.diff
@@ -67,7 +67,7 @@
 +
 +.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
 +WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib
-+CLIMAKER=climaker
++CLIMAKER=$(BIN)$/climaker
 +.ELSE
 +CLIMAKER=climaker.exe
 +.ENDIF
@@ -80,8 +80,8 @@
  #When changing the assembly version then this must also be done in scp2
 -$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
 -	$(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
-+$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-+	$(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
++$(OUT)$/bin$/cli_uretypes.dll : $(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
++	$(WRAPCMD) $(CLIMAKER) $(CLIMAKERFLAGS) \
  		--out $@ \
  		--keyfile $(BIN)$/cliuno.snk \
  		--assembly-version $(CLI_URETYPES_NEW_VERSION) \