[Libreoffice-commits] .: instsetoo_native/util

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Feb 18 13:09:01 PST 2011


 instsetoo_native/util/makefile.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ba1da290bd44677bdf3576e6b3fcd02a102ed667
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 18 22:08:06 2011 +0100

    Fix build of master without Python scripting.

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index da4478c..d13c434 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -71,9 +71,13 @@ INSTALLDIR=$(OUT)
 LOCALPYFILES= \
     $(BIN)$/uno.py \
     $(BIN)$/unohelper.py \
-    $(BIN)$/pythonloader.py \
+    $(BIN)$/pythonloader.py
+
+.IF "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
+LOCALPYFILES+= \
     $(BIN)$/officehelper.py \
     $(BIN)$/mailmerge.py
+.ENDIF
 
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml


More information about the Libreoffice-commits mailing list