Commits

Anonymous committed d58b234 Merge

merge

  • Participants
  • Parent commits 37b8ed1, 485eee5

Comments (0)

Files changed (2)

File solenv/bin/transform_description.pl

 
     # 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 );

File solenv/inc/tg_xmerge.mk

 $(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))