[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scripting/source

[Hanno Meyer-Thurow]

 scripting/source/pyprov/makefile.mk |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 021a906cb52757f2804576af59dab5b6df2a9aa2
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Mon Apr 25 22:05:18 2011 +0200

    Update '--disable-python' to disable only Python UNO API.
    
    * scripting/source/pyprov/makefile.mk:

diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index fa43858..a96c3f3 100755
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -35,7 +35,8 @@ TARGET=pyprov
 .INCLUDE :  settings.mk
 
 # --- Targets ------------------------------------------------------
-.IF "$(DISABLE_PYTHON)" != "TRUE"
+# mailmerge is put in an extra services.rdb
+# simply do not fiddle with that. cws sb123, sb129
 ALL : ALLTAR \
     $(DLLDEST)$/officehelper.py	\
         $(DLLDEST)$/mailmerge.py
@@ -68,9 +69,3 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
 .INCLUDE : target.mk
 
 .ENDIF
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF