From 37fbefc3e3140b96527887d8b6d3c99132635cf3 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Tue, 15 Jan 2019 16:17:07 +0000 Subject: Try to locate NLS catalogs in the TDS. git-svn-id: svn://tug.org/texlive/trunk@49711 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebboot.cin | 41 +++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'Build/source/texk/web2c/cwebboot.cin') diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin index af9137e199e..3f897fb5237 100644 --- a/Build/source/texk/web2c/cwebboot.cin +++ b/Build/source/texk/web2c/cwebboot.cin @@ -31,7 +31,7 @@ #include /*:85*//*88:*/ -#line 1205 "cwebdir/comm-w2c.ch" +#line 1211 "cwebdir/comm-w2c.ch" #include @@ -48,7 +48,7 @@ #endif /*:88*//*90:*/ -#line 1263 "cwebdir/comm-w2c.ch" +#line 1278 "cwebdir/comm-w2c.ch" typedef bool boolean; #define HAVE_BOOLEAN @@ -171,12 +171,13 @@ err_print(_("! Include file name too long") ) ;goto restart;} \ #define C_printf(c,a) fprintf(C_file,c,a) #define C_putc(c) putc(c,C_file) \ +#define max_banner 50 +#define max_path_length (BUFSIZ-2) \ + #define PATH_SEPARATOR separators[0] #define DIR_SEPARATOR separators[1] #define DEVICE_SEPARATOR separators[2] \ -#define max_banner 50 \ - #define _(STRING) gettext(STRING) \ #define kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true) \ @@ -331,9 +332,11 @@ char change_buffer[buf_size]; char*change_limit; /*:11*//*86:*/ -#line 1180 "cwebdir/comm-w2c.ch" +#line 1184 "cwebdir/comm-w2c.ch" char cb_banner[max_banner]; +char locale_path[max_path_length]= "/usr/share/locale/"; +string texmf_locale; #ifndef SEPARATORS #define SEPARATORS "://" #endif @@ -425,7 +428,7 @@ static void check_change(void); static void prime_the_change_buffer(void); /*:84*//*95:*/ -#line 1319 "cwebdir/comm-w2c.ch" +#line 1334 "cwebdir/comm-w2c.ch" void cb_show_banner(void); static void cb_usage(const_string str); @@ -465,7 +468,7 @@ root= NULL; #line 72 "cwebdir/comm-w2c.ch" /*91:*/ -#line 1284 "cwebdir/comm-w2c.ch" +#line 1299 "cwebdir/comm-w2c.ch" kpse_set_program_name(argv[0],"cweb"); @@ -473,12 +476,20 @@ kpse_set_program_name(argv[0],"cweb"); #line 73 "cwebdir/comm-w2c.ch" /*89:*/ -#line 1236 "cwebdir/comm-w2c.ch" +#line 1242 "cwebdir/comm-w2c.ch" setlocale(LC_MESSAGES,setlocale(LC_CTYPE,"")); -bindtextdomain("cweb","/usr/share/locale/"); -bindtextdomain("cweb-tl","/usr/share/locale/"); -bindtextdomain("web2c-help","/usr/share/locale/"); +texmf_locale= kpse_var_expand("$TEXMFLOCALEFILES"); +if(texmf_locale){ +if(strlen(texmf_locale)