Makefile.in | 4 ++-- solenv/gbuild/AllLangHelp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 61add5c77de1ff963b839020c77f67f14ef07de1 Author: Peter Foley <[email protected]> Date: Mon Mar 4 19:16:59 2013 -0500 propagate use flags to sub-make processes Change-Id: I7974e68f3dd55c5ad859276e482d93a94af0cd28 diff --git a/Makefile.in b/Makefile.in index 53ec395..a605d14 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,9 +58,9 @@ include $(BUILDDIR)/config_$(gb_Side).mk ifeq ($(GMAKE_OPTIONS),) ifeq ($(verbose)$(VERBOSE),) -export GMAKE_OPTIONS:=-rs +export GMAKE_OPTIONS:=-rs$(MAKEFLAGS) else -export GMAKE_OPTIONS:=-r +export GMAKE_OPTIONS:=-r$(MAKEFLAGS) endif endif commit ad81c67b19b522e007e0e553695a4aad82892568 Author: Peter Foley <[email protected]> Date: Mon Mar 4 19:16:23 2013 -0500 avoid doubling en-US Change-Id: I78192d10c4b337631091aed5ffee9f2973f06964 diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index 14207f2..95cdd8c 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -17,7 +17,7 @@ gb_AllLangHelp_TRANLATIONSDIR := $(SRCDIR)/translations # Creates and delivers all language versions of a module. -gb_AllLangHelp_LANGS := en-US $(gb_WITH_LANG) +gb_AllLangHelp_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) define gb_AllLangHelp__translation_exists $(or \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
