diff options
Diffstat (limited to 'pyuno/source/loader')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index ea5d907250bc..67fbe81e482e 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -94,7 +94,7 @@ COMPONENTS= \ invocadapt.uno \ proxyfac.uno \ reflection.uno \ - pythonloader.uno + .$/pythonloader.uno # --- Targets ------------------------------------------------------ @@ -107,20 +107,12 @@ ALL : ALLTAR \ $(DLLDEST)$/%.py: %.py cp $? $@ -# For Mac OS X, -# The python loader component is linked against libpyuno.dylib, -# which hasn't been delivered yet but dyld needs to know where it is -# so regcomp can load the component. $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST) -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb -.IF "$(OS)"=="MACOSX" - cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" -.ELSE .IF "$(GUI)$(COM)"=="WNTGCC" - cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(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 $(foreach,i,$(COMPONENTS) -c $(i)) + cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i)) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.ENDIF # $(OS)=="MACOSX" cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb |