diff options
Diffstat (limited to 'pyuno/source/loader/makefile.mk.rej')
| -rw-r--r-- | pyuno/source/loader/makefile.mk.rej | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/pyuno/source/loader/makefile.mk.rej b/pyuno/source/loader/makefile.mk.rej deleted file mode 100644 index f8a8e489aeaf..000000000000 --- a/pyuno/source/loader/makefile.mk.rej +++ /dev/null @@ -1,20 +0,0 @@ ---- pyuno/source/loader/makefile.mk -+++ pyuno/source/loader/makefile.mk -@@ -89,11 +89,17 @@ - $(DLLDEST)$/pyuno_services.rdb - .ENDIF # L10N_framework - -+ALLTAR: $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL)) -+ - .INCLUDE : target.mk - .IF "$(L10N_framework)"=="" - $(DLLDEST)$/%.py: %.py - cp $? $@ - -+$(MISC)/installname_loader : $(LB)/$(TARGET)$(DLLPOST) -+ install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $< -+ touch $@ -+ - $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST) - -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb - cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i)) |