[Libreoffice-commits] .: instsetoo_native/util

Jan Holesovsky kendy at kemper.freedesktop.org
Wed Aug 24 03:17:09 PDT 2011


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

New commits:
commit 3275813bf8eee75d76cba5742283e20f6d90740a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 24 12:16:24 2011 +0200

    uno.py is in bin on Windows, and in lib elsewhere, what fun.

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index a63e932..5301105 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -313,8 +313,13 @@ openoffice:
 $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
+.IF "$(GUI)"!="WNT"
+$(BIN)$/%.py : $(OUTDIR)$/lib$/pyuno$/%.py
+    $(COPY) $< $@
+.ELSE
 $(BIN)$/%.py : $(OUTDIR)$/bin$/pyuno$/%.py
     $(COPY) $< $@
+.ENDIF
 .ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
 
 $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip


More information about the Libreoffice-commits mailing list