[ooo-build-commit] Branch 'ooo/master' - l10n/source l10n/util

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Jul 28 19:28:32 PDT 2009


 l10n/source/makefile.mk |    7 +++++++
 l10n/util/makefile.mk   |    7 +++++++
 2 files changed, 14 insertions(+)

New commits:
commit 6904c423644afb082e230c5af228c7b3623df8de
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jul 28 17:44:58 2009 +0000

    #i10000# #i103809# no need to build here without WITH_LANG

diff --git a/l10n/source/makefile.mk b/l10n/source/makefile.mk
index c9beac9..2f6f6ab 100755
--- a/l10n/source/makefile.mk
+++ b/l10n/source/makefile.mk
@@ -67,6 +67,12 @@ TARGET=l10n_merge
 # --- Targets ------------------------------------------------------
 .INCLUDE : settings.mk
 
+.IF "$(WITH_LANG)" == ""
+
+ at all:
+    @echo "Nothing to do - en-US only build."
+.ELSE
+
 .IF "$(USE_SHELL)"!="4nt"
 all_sdfs:=$(shell cd $(PRJ)$/source && ls -1 *$/localize.sdf)
 .ELSE          # "$(USE_SHELL)"!="4nt"
@@ -89,3 +95,4 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
 .ENDIF			# "$(L10n_LOCK)" != "YES"
     $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && $(TOUCH) $@
 
+.ENDIF
diff --git a/l10n/util/makefile.mk b/l10n/util/makefile.mk
index 62270ce..2b0ec3a 100755
--- a/l10n/util/makefile.mk
+++ b/l10n/util/makefile.mk
@@ -67,6 +67,12 @@ TARGET=l10n_zip
 # --- Targets ------------------------------------------------------
 .INCLUDE : settings.mk
 
+.IF "$(WITH_LANG)" == ""
+
+ at all:
+    @echo "Nothing to do - en-US only build."
+.ELSE
+
 all_modules:=$(shell cd $(COMMONMISC)$/sdf && ls -1 )
 
 .INCLUDE : target.mk
@@ -78,4 +84,5 @@ $(COMMONBIN)$/%.zip : $(COMMONMISC)$/merge.done
     $(RM) $@
     $(RENAME) $(@:d)$(@:b)_$(INPATH).zip $@
 
+.ENDIF
 


More information about the ooo-build-commit mailing list