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

[Tor Lillqvist]

 patches/dev300/layout-parallel-build.diff |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit fa89409cd0a495f226d561919fc96d237f595ec4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:48:07 2011 +0300

    Make layout-parallel-build.diff apply again

diff --git a/patches/dev300/layout-parallel-build.diff b/patches/dev300/layout-parallel-build.diff
index 3f43344..6eb3b8b 100644
--- a/patches/dev300/layout-parallel-build.diff
+++ b/patches/dev300/layout-parallel-build.diff
@@ -1,14 +1,6 @@
----
- solenv/inc/layout.mk |   23 ++++++++++-------------
- 1 files changed, 10 insertions(+), 13 deletions(-)
-
-diff --git solenv/inc/layout.mk solenv/inc/layout.mk
-index 0fb4c39..40697e6 100644
 --- solenv/inc/layout.mk
 +++ solenv/inc/layout.mk
-@@ -1,32 +1,29 @@
--TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
-+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
+@@ -1,31 +1,28 @@
  XML_DEST=$(DLLDEST)
  XML_LANGS=$(alllangiso)
  
@@ -49,6 +41,3 @@ index 0fb4c39..40697e6 100644
      $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
 -
 -$(ZIP1LIST): localize.sdf
--- 
-1.7.0.1
-