mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS ause069 (1.9.26); FILE MERGED

Browse Source 
2006/11/24 14:52:51 hjs 1.9.26.1: #i70359# remove forced shell calls
This commit is contained in:
Oliver Bolte
2007-01-25 14:35:54 +00:00
parent bbf74fa6e5
commit 54fb2127fb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pyuno/zipcore/makefile.mk
View File

@@ -19,7 +19,7 @@ PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
.ENDIF .ENDIF
FINDLIBFILES_TMP:=$(subst,/,$/ \ FINDLIBFILES_TMP:=$(subst,/,$/ \
$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc )) $(shell $(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
FILES=\ FILES=\
@@ -46,16 +46,16 @@ $(BIN)$/python-core-$(PYVERSION).zip : $(FILES) $(BIN)$/python.sh
.ENDIF .ENDIF
.ENDIF .ENDIF
-rm -f $@ -rm -f $@
+cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME) cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
$(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/% $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-+$(MKDIRHIER) $(@:d) -$(MKDIRHIER) $(@:d)
-rm -f $@ -rm -f $@
cat $< > $@ cat $< > $@
.IF "$(GUI)"== "UNX" .IF "$(GUI)"== "UNX"
$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST) $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
-+$(MKDIRHIER) $(@:d) -$(MKDIRHIER) $(@:d)
-rm -f $@ -rm -f $@
cat $< > $@ cat $< > $@
.IF "$(OS)" != "MACOSX" .IF "$(OS)" != "MACOSX"
@@ -64,7 +64,7 @@ $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
chmod +x $@ chmod +x $@
.ELSE .ELSE
$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) $(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+$(MKDIRHIER) $(@:d) -$(MKDIRHIER) $(@:d)
-rm -f $@ -rm -f $@
cat $< > $@ cat $< > $@
.ENDIF .ENDIF