summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-08-25 14:42:57 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-08-25 14:42:57 +0200
commit7d9a97af7bfcd711e6f4e95c5c28bf7c657fe148 (patch)
treed67a24507d406cae36119e75a3fc24525349fa12 /solenv
parent3c81bc6102f96f679daa55944a17e8a0df316865 (diff)
parent561cd791cf0807cb43e162281c714def6d5aeaba (diff)
CWS-TOOLING: integrate CWS ext004
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/transform_description.pl4
-rwxr-xr-xsolenv/inc/tg_xmerge.mk17
2 files changed, 10 insertions, 11 deletions
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
index 021e1c0ac..b0d0ce7d3 100644
--- a/solenv/bin/transform_description.pl
+++ b/solenv/bin/transform_description.pl
@@ -55,9 +55,9 @@ sub parse_args
# check which languages to use
my $languages = $ENV{WITH_LANG};
- if ( ! defined $languages )
+ if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
{
- print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+ print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
$languages = "en-US";
}
@languages = split ( ' ', $languages );
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index fa3e22971..6ff412bb0 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -27,33 +27,32 @@
.IF "$(XTXFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
+L10NEXT*=.txt
+XTX_TARGET_PATH*=$(MISC)/$(TARGET)
-.IF "$(L10NEXT)"==""
-L10NEXT:=.txt
-.ENDIF
+ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES)
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXFILES)
$(XTXFILES) : $(LOCALIZESDF)
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk
+.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk
.IF "$(alllangiso)"!="$(last_merge)"
XTXMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
- $(COMMAND_ECHO)$(COPY) $< $@
+ $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT)
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
$(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
$(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line