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

fix mis-merge

Browse Source
This commit is contained in:
David Tardon
2011-03-31 08:40:21 +02:00
parent a43360f523
commit a84bd1fa8b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripting/source/pyprov/makefile.mk
View File

@@ -43,6 +43,14 @@ ALL : ALLTAR \
$(DLLDEST)$/%.py: %.py $(DLLDEST)$/%.py: %.py
cp $? $@ cp $? $@
ALLTAR : $(MISC)/mailmerge.component
$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
mailmerge.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt mailmerge.component
# scripting provider extension # scripting provider extension
.IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES" .IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
@@ -59,20 +67,6 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
.INCLUDE : target.mk .INCLUDE : target.mk
ALLTAR : $(MISC)/mailmerge.component $(MISC)/pythonscript.component
$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
mailmerge.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt mailmerge.component
$(MISC)/pythonscript.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt pythonscript.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_PYTHON)pythonscript' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt pythonscript.component
.ENDIF .ENDIF
.ELSE .ELSE