[Libreoffice-commits] .: 2 commits - configure.in solenv/gbuild

[Libreoffice Gerrit user]

 configure.in                     |    3 ++-
 solenv/gbuild/ExtensionTarget.mk |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b49e97e29431e9f7248b9cd75d5a5c8fb88dfc4d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 16 13:20:25 2012 +0200

    --with-lang=en-US is already the default
    
    Change-Id: I906e025e1b7eb8ecda028eef89ac5667cd2aac13

diff --git a/configure.in b/configure.in
index 3326751..9906ead 100644
--- a/configure.in
+++ b/configure.in
@@ -12204,7 +12204,8 @@ WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
 # this variable is used only by bin/distro-install-* helper scripts
 # they need a real list of languages
 test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
-test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS"
+test "$WITH_LANG" = "en-US" && WITH_LANG=
+test -z "$WITH_LANG" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS"
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
 AC_SUBST(WITH_LANG_LIST)
commit 24f9ae3720870b61568f7034f7bc74531b1077cd
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 16 13:17:53 2012 +0200

    avoid potential build failure
    
    Change-Id: Idc838315696666c8fcb08d28ed4c0b991e185008

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 91f1be3..eb45785 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -112,7 +112,7 @@ $(call gb_ExtensionTarget_get_target,%) : \
 		$(call gb_ExtensionTarget__subst_platform,$(call gb_ExtensionTarget_get_workdir,$*)/description.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/description.xml) && \
 		$(call gb_ExtensionTarget__subst_platform,$(LOCATION)/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \
 		$(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \
-		$(if $(and $(gb_WITH_LANG),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \
+		$(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \
 		cd $(call gb_ExtensionTarget_get_rootdir,$*) && \
 		$(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync \
 			$(call gb_ExtensionTarget_get_target,$*) \