[Libreoffice-commits] .: Branch 'libreoffice-3-4' - bin/setup.in configure.in

Andras Timar timar at kemper.freedesktop.org
Sun May 1 22:06:03 PDT 2011


 bin/setup.in |    6 +++---
 configure.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a63ae8ab4d9add0566f426900bcc4af81a8c6cc5
Author: Andras Timar <atimar at novell.com>
Date:   Mon May 2 07:05:41 2011 +0200

    s/postset.mk/langlist.mk/

diff --git a/bin/setup.in b/bin/setup.in
index 1410654..296da45 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -171,15 +171,15 @@ LIB=`echo $LIBDIRBASE|sed 's|.*/||'`
 
 # substitute ALL to the list of languages if possible
 test -n "$OO_TOOLSDIR" && solenv_dir=$SOLARENV || solenv_dir=$OOBUILDDIR/solenv
-if test -f $solenv_dir/inc/postset.mk ; then
-    # generate shell variable from completelangiso= from solenv/inc/postset.mk
+if test -f $solenv_dir/inc/langlist.mk ; then
+    # generate shell variable from completelangiso= from solenv/inc/langlist.mk
     # the sed command does the following:
     #	+ if a line ends with a backslash, append the next line to it
     #	+ adds " on the beginning of the value (after =)
     #	+ adds " at the end of the value
     #	+ removes en-US; we want to put it on the beginning
     #	+ prints just the section starting with 'completelangiso=' and ending with the " at the end of line
-    eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' $solenv_dir/inc/postset.mk)
+    eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' $solenv_dir/inc/langlist.mk)
     ALL_LANGS="en-US $completelangiso"
     OOO_LANGS_LIST=`echo $OOO_LANGS | sed -e "s|ALL|$ALL_LANGS|g"`
 fi
diff --git a/configure.in b/configure.in
index 48d38b6..ab3b6c6 100755
--- a/configure.in
+++ b/configure.in
@@ -1328,7 +1328,7 @@ AC_SUBST(docdir)
 # WARNING: The --with-lang= configure option changed, see
 #  http://blog.janik.cz/archives/permalinks/2004-11-02T20_04_29.html
 #  e.g.
-#  --with-lang="ALL"      # see solenv/inc/postset.mk
+#  --with-lang="ALL"      # see solenv/inc/langlist.mk
 #  --with-lang="en-US cs"
 #  --with-lang="ALL xy"
 AC_MSG_CHECKING([for requested localizations])


More information about the Libreoffice-commits mailing list