diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 16:53:07 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 16:53:07 +0200 |
| commit | 03604560ce01e1f08e9e2b258d67657005c98cd8 (patch) | |
| tree | 199758aa018f349119f9e97d1f5e9f98c98691b4 /pyuno | |
| parent | 7abe7b6221b696dd7f61dc6ad8daa24149701a72 (diff) | |
fix compilation with internal python on Mac
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 6 | ||||
| -rw-r--r-- | pyuno/source/module/makefile.mk | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index d8791e9ffa8e..76c3dc2ffecd 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -85,14 +85,10 @@ $(DLLDEST)$/%.py: %.py cp $? $@ .ENDIF # L10N_framework -ALLTAR : $(MISC)/pythonloader.component $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL)) +ALLTAR : $(MISC)/pythonloader.component $(MISC)/pythonloader.component .ERRREMOVE : \ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component $(XSLTPROC) --nonet --stringparam uri \ 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component - -$(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 $@ diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 81050c120021..627a97d711f7 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -90,7 +90,7 @@ SHL1STDLIBS= \ $(PYTHONLIB) \ $(EXTRA_FRAMEWORK_FLAG) -SHL1DEPN= +SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL)) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1IMPLIB= i$(TARGET) @@ -121,7 +121,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def targetdll=$(LB)$/$(TARGET)$(DLLPOST) .ENDIF -ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \ +ALLTAR : \ $(DLLDEST)$/uno.py \ $(DLLDEST)$/unohelper.py \ $(targetdll) \ @@ -134,11 +134,10 @@ ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \ $(DLLDEST)$/%.py: %.py cp $? $@ -$(MISC)/installname_module : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST) - install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $< - # hack to make checkdll happy - ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework - touch $@ +# make checkdll happy +$(MISC)/framework_link : + $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework + @touch $@ $(MISC)$/$(PYUNORC) : pyuno -rm -f $@ |