diff options
| author | Andras Timar <atimar@novell.com> | 2011-04-26 10:27:13 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@novell.com> | 2011-04-26 10:27:13 +0200 |
| commit | 32352e1ce8ae68f8e3fc31d4be42a4997917ae57 (patch) | |
| tree | eadd6286dda0ede1c6640204d036489ec6200f2f /solenv/inc | |
| parent | a765a3e7c3e7532e63d34abfa8004254f5f53175 (diff) | |
put L10N_MODULE definition to set_soenv instead of settings.mk
and remove alternative l10n locations from settings.mk
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index c8e10c138a05..c8f168c1cf3d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -804,23 +804,9 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR -.IF "$(GUI)" == "WNT" -L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations) -.ELSE -L10N_MODULE*=$(SRC_ROOT)/translations -.ENDIF -ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so - .IF "$(WITH_LANG)"!="" .INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk -.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk - -# check for localizations not hosted in l10n module. if a file exists there -# it won't in l10n -.IF "$(ALT_LOCALIZATION_FOUND)"!="" -TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf -LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) -.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" + # if the l10n module exists, use split localize.sdf directly from there .IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"=="" # still check for existence as there may be no localization yet |