diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 13:29:10 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 13:29:10 +0200 |
| commit | dcd2922397877ac1de98fe31e09daa098123f3d1 (patch) | |
| tree | b5090d6e622237b76110a2c9abaf6db710e57002 | |
| parent | feab7d2bb9b1ce6feab87b57cad411be08656d7c (diff) | |
| parent | 75004ade2618785181f4b8575585911f0c25c9a5 (diff) | |
DEV300: merge masterfix ea9085d6db4c@DEV300ooo/DEV300_m77
| -rwxr-xr-x | l10n/source/makefile.mk | 23 | ||||
| -rwxr-xr-x[-rw-r--r--] | l10n/util/update_l10n/makefile.mk | 5 |
2 files changed, 9 insertions, 19 deletions
diff --git a/l10n/source/makefile.mk b/l10n/source/makefile.mk index ea9a7a18..8e15a87f 100755 --- a/l10n/source/makefile.mk +++ b/l10n/source/makefile.mk @@ -38,25 +38,20 @@ TARGET=l10n_merge @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" -all_sdfs:=$(shell $(CDD) $(PRJ)$/source && find * -name localize.sdf) -all_sdfs!:=$(subst,/,\ $(all_sdfs)) -.ENDIF # "$(USE_SHELL)"!="4nt" +all_sdfs:=$(shell cd $(PRJ)/source && ls -1 */localize.sdf) -.INCLUDE .IGNORE : $(COMMONMISC)$/sdf$/lock.mk +.INCLUDE .IGNORE : $(COMMONMISC)/sdf/lock.mk .INCLUDE : target.mk -ALLTAR : $(COMMONMISC)$/merge.done +ALLTAR : $(COMMONMISC)/merge.done -$(COMMONMISC)$/merge.done : $(all_sdfs) +$(COMMONMISC)/merge.done : $(all_sdfs) .IF "$(L10N_LOCK)" != "YES" - $(IFEXIST) $(COMMONMISC)$/sdf $(THEN) $(RENAME) $(COMMONMISC)$/sdf $(COMMONMISC)$/sdf$(INPATH)_begone $(FI) - -rm -rf $(COMMONMISC)$/sdf$(INPATH)_begone - -$(MKDIRHIER) $(COMMONMISC)$/sdf + $(IFEXIST) $(COMMONMISC)/sdf $(THEN) $(RENAME) $(COMMONMISC)/sdf $(COMMONMISC)/sdf$(INPATH)_begone $(FI) + -rm -rf $(COMMONMISC)/sdf$(INPATH)_begone + -$(MKDIRHIER) $(COMMONMISC)/sdf .ENDIF # "$(L10n_LOCK)" != "YES" - $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && $(TOUCH) $@ - + $(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@ + $(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc .ENDIF diff --git a/l10n/util/update_l10n/makefile.mk b/l10n/util/update_l10n/makefile.mk index 51de6616..7f57c27e 100644..100755 --- a/l10n/util/update_l10n/makefile.mk +++ b/l10n/util/update_l10n/makefile.mk @@ -44,12 +44,7 @@ TARGET=l10n_update @echo "Nothing to do - en-US only build." .ELSE -.IF "$(USE_SHELL)"!="4nt" all_sdfs:=$(shell ls -1 $(PRJ)$/source$/*$/localize.sdf) -.ELSE # "$(USE_SHELL)"!="4nt" -all_sdfs:=$(shell $(CDD) $(PRJ)$/source && find * -name localize.sdf) -all_sdfs!:=$(subst,/,\ $(all_sdfs)) -.ENDIF # "$(USE_SHELL)"!="4nt" .INCLUDE .IGNORE : $(COMMONMISC)$/sdf$/lock.mk |