diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:21:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:21:17 +0000 |
| commit | 77ff5c70d001b52bcd8796a4fdb400a6d87c52e1 (patch) | |
| tree | dd0e59cab79586d0ee1a2886c59784714fbb5f2a /pyuno/zipcore | |
| parent | c8da3e59406c3bf9a5ec81d8a806601275fe885a (diff) | |
INTEGRATION: CWS pythonlinkfix (1.6.34); FILE MERGED
2005/11/06 02:17:59 maho 1.6.34.1: Don't use postscript for pyuno project
Issue number: #i56955#
Diffstat (limited to 'pyuno/zipcore')
| -rwxr-xr-x | pyuno/zipcore/makefile.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index ec9bce0ca94d..76f883044673 100755 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -12,7 +12,11 @@ systempython: PYDIRNAME=python-core-$(PYVERSION) DESTROOT=$(BIN)$/python-core-$(PYVERSION) +.IF "$(GUI)" == "UNX" +PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin +.ELSE PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST) +.ENDIF FINDLIBFILES_TMP:=$(subst,/,$/ \ $(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc )) @@ -29,6 +33,8 @@ target: \ $(BIN)$/python.sh : python.sh -rm -f $@ cat $? > $@ + sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new + mv $@.new $@ .IF "$(GUI)" == "UNX" chmod +x $@ .ENDIF @@ -47,15 +53,21 @@ $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/% -rm -f $@ cat $< > $@ -$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) +.IF "$(GUI)"== "UNX" +$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST) -+$(MKDIRHIER) $(@:d) -rm -f $@ cat $< > $@ -.IF "$(GUI)"== "UNX" .IF "$(OS)" != "MACOSX" strip $@ .ENDIF chmod +x $@ +.ELSE +$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) + -+$(MKDIRHIER) $(@:d) + -rm -f $@ + cat $< > $@ + strip $@ .ENDIF .ENDIF |