[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 280689154fc111d0c742922fceee20ea52c9695d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:23:32 2011 +0300

    Make buildfix-instsetoo_native-no-PKGFORMAT.diff apply again

diff --git a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
index 0cdc4fd..19c113f 100644
--- a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
+++ b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
@@ -1,4 +1,3 @@
-diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -201,6 +201,7 @@
@@ -10,10 +9,10 @@ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.
  .IF "$(MAKETARGETS)"!=""
  .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 @@ -277,6 +278,7 @@
- 	@echo cannot pack nothing...
+     @echo cannot pack nothing...
  
  .ENDIF			# "$(alllangiso)"!=""
 +.ENDIF
  
+ .IF "$(DISABLE_PYTHON)" != "TRUE"
  .IF "$(LOCALPYFILES)"!=""
- $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)