diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 20:19:03 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 20:19:03 +0200 |
| commit | f892f979ce17c70ccff5c802db17f24129628504 (patch) | |
| tree | b9c5c815b96898c4e32320b60cb7b5010b7ee880 /python/makefile.mk | |
| parent | Initial attempt at Android cross-compilation support (diff) | |
| download | core-f892f979ce17c70ccff5c802db17f24129628504.tar.gz core-f892f979ce17c70ccff5c802db17f24129628504.zip | |
add dylib to the list of native python modules for Mac (for pyuno.dylib)
Diffstat (limited to 'python/makefile.mk')
| -rw-r--r-- | python/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index b43147dd3943..d91660a3d350 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -88,7 +88,7 @@ CONFIGURE_ACTION += --disable-ipv6 .ENDIF .IF "$(OS)" == "MACOSX" -PATCH_FILES+=Python-2.6.1-py8067.patch +PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch # don't build dual-arch version as OOo itself is not universal binary either PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch @@ -235,7 +235,6 @@ $(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/f $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) @-rm -f $@ - @echo process $@ - $(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@ + $(COMMAND_ECHO)$(COPY) pyversion.mk $@ .ENDIF # DISABLE_PYTHON != TRUE |