summaryrefslogtreecommitdiff
path: root/scripting/source
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-03-31 08:40:21 +0200
committerDavid Tardon <dtardon@redhat.com>2011-03-31 08:40:21 +0200
commita84bd1fa8b33164fa351c65e13acab1dbff2ba30 (patch)
tree94a265bb9f8b96538852f837df6dcbd92c5cb7a1 /scripting/source
parenta43360f52338574974bcf7badb71e3d3ba6ccf14 (diff)
fix mis-merge
Diffstat (limited to 'scripting/source')
-rwxr-xr-xscripting/source/pyprov/makefile.mk22
1 files changed, 8 insertions, 14 deletions
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index d7f477688640..fa43858021bb 100755
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -43,6 +43,14 @@ ALL : ALLTAR \
$(DLLDEST)$/%.py: %.py
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
.IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
@@ -59,20 +67,6 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
.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
.ELSE