[ooo-build-commit] Branch 'ooo/master' - pyuno/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Jul 16 19:41:24 PDT 2009


 pyuno/source/loader/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 354700687e18a7b491a7e0d7b0219cbdddd721b8
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Jul 16 10:52:40 2009 +0000

    CWS-TOOLING: integrate CWS mingwport21
    2009-07-01 15:17:50 +0200 tono  r273595 : i#102971: mingw port without solarbindir in PATH
    2009-07-01 15:15:44 +0200 tono  r273591 : i#90212: dmake not releasing file descriptor

diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 67fbe81..11ece47 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -110,7 +110,7 @@ $(DLLDEST)$/%.py: %.py
 $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST)
     -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))"
+    cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))"
 .ELSE
     cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))
 .ENDIF    # "$(GUI)$(COM)"=="WNTGCC" 


More information about the ooo-build-commit mailing list