[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/inc

[Tor Lillqvist]

 solenv/inc/extension_helplink.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84d74bd6e241e527335ae9ee6353090e7db03cac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Nov 30 15:21:17 2010 +0200

    Stopgap help for the CPU-bound long hang in bug fdo#31716
    
    As the hang seems to be causes by the code messing around in extension
    help file directories, of which there are lots in a multi-lingual
    build for at least the presenter-screen extension, just build en-US
    extension help for now.
    
    Why such a change is needed both here and in
    sdext/source/presenter/makefile.mk (see commit
    c2a7a6c055cf586b627268d38fd85cde2048db3d in the "extensions" repo) I
    don't know, but that's how it seemed in my testing.

diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index c9fa15e..7dbf59c 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -38,7 +38,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
 .ENDIF
 
 #aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
-aux_alllangiso*:=$(alllangiso)
+aux_alllangiso*:=en-US
 
 #########################################################