diff options
| -rwxr-xr-x | pyuno/zipcore/makefile.mk | 6 | ||||
| -rw-r--r-- | pyuno/zipcore/python.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index 06241da2b..bad3058a4 100755 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -81,7 +81,7 @@ ALLTAR : $(BIN)$/python.sh $(BIN)$/python.sh : python.sh -rm -f $@ cat $? > $@ - sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new + sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ | sed 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g' > $@.new mv $@.new $@ chmod +x $@ .ENDIF @@ -93,7 +93,7 @@ $(OUT)$/inc$/pyversion.hxx: pyversion.inc $(BIN)$/$(PYDIRNAME).zip : $(FILES) .IF "$(GUI)" == "UNX" -.IF "$(OS)" != "MACOSX" +.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX" cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip .ENDIF .ENDIF @@ -110,7 +110,7 @@ $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST) -$(MKDIRHIER) $(@:d) -rm -f $@ cat $< > $@ -.IF "$(OS)" != "MACOSX" +.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX" strip $@ .ENDIF chmod +x $@ diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh index b53e369fe..219e7379a 100644 --- a/pyuno/zipcore/python.sh +++ b/pyuno/zipcore/python.sh @@ -43,9 +43,9 @@ cd "$sd_cwd" PATH=$sd_prog${PATH+:$PATH} export PATH -# Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so: -LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -export LD_LIBRARY_PATH +# Set %%OOO_LIBRARY_PATH_VAR%% so that "import pyuno" finds libpyuno.so: +%%OOO_LIBRARY_PATH_VAR%%=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%} +export %%OOO_LIBRARY_PATH_VAR%% # Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable: : ${UNO_PATH=$sd_prog} |