[Libreoffice-commits] .: officecfg/util scripting/source

[Hanno Meyer-Thurow]

 officecfg/util/makefile.mk          |    1 -
 scripting/source/pyprov/makefile.mk |    7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit fded3924bc359131356a4dfbab6078e7e745b66f
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Sun Mar 13 16:15:04 2011 +0100

    Merge Gentoo patches from old build and downstream repositories.
    
    1. Do not add compiler default include and library path: potentially build
       against different version of system library than requested by the user.
    2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
       available for more than two years. Noone cares, therefore rest in peace.
       Python2 is going to be ditched at some point. Simply do not fail then.
       Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
       handled nowadays?
    3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
    4. Add a configure option to search only in one place for JVMs, which is quite
       interesting for Linux Distributions. Enforce the user to place JVMs in one
       base directory.
    5. Fix build for libxml-2.7.8 with ICU support.
    
    * config_office-XINC-XLIB-defaults.diff: (1)
    * disable-python.diff: (2)
    * gentoo-sandbox.diff: (3)
    * jvm-search-path.diff: (4)
    * libxmlsec_fix_extern_c.diff: (5)

diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index f87e270..c1fa542 100644
--- a/officecfg/util/makefile.mk
+++ b/officecfg/util/makefile.mk
@@ -37,7 +37,6 @@ TARGET=util
 
 $(MISC)$/$(TARGET)_delzip :
     -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
-    -$(RM) $(COMMON_OUTDIR)$/bin$/registry_{$(alllangiso)}.zip
 
 $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
     cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index e9a065a..ca63729 100644
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -35,6 +35,7 @@ TARGET=pyprov
 .INCLUDE :  settings.mk
 
 # --- Targets ------------------------------------------------------
+.IF "$(DISABLE_PYTHON)" != "TRUE"
 ALL : ALLTAR \
     $(DLLDEST)$/officehelper.py	\
         $(DLLDEST)$/mailmerge.py
@@ -59,3 +60,9 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
 .INCLUDE : target.mk
 
 .ENDIF
+
+.ELSE
+
+.INCLUDE : target.mk
+
+.ENDIF