debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into utf8-conversion after 2.3.1 release

Browse Source
This commit is contained in:
Jon Trulson
2019-11-16 16:34:48 -07:00
parent 2e4deb41c0 9753b63dab
commit ba68ff0a17
152 changed files with 770 additions and 18307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/localized/templates/header2.tmpl
View File

@@ -55,7 +55,7 @@ dtprintinfo.cat: dtprintinfo.msg @@\
export LANG; \ @@\
LC_COLLATE=C; \ @@\
export LC_COLLATE; \ @@\
$(SYM2NUM_CMD) $(@:.cat=) $(@:.cat=.msg) > tmp.msg; \ @@\
CPP="$(CPP)" $(SYM2NUM_CMD) $(@:.cat=) $(@:.cat=.msg) > tmp.msg; \ @@\
$(GENCAT) $@ tmp.msg; \ @@\
rm -f tmp.msg $(@:.cat=_msg.h) \ @@\
) @@\

4
cde/programs/localized/util/merge.c
View File

@@ -240,7 +240,7 @@ void cat_open (void)
if(pfile != NULL)
{
sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile);
sprintf(line,"gencat ./.dt_pfile.cat %s",pfile);
if ( system(line) != 0 )
{
fatal("primary .tmsg file would not gencat\n",0,9);
@@ -251,7 +251,7 @@ void cat_open (void)
if(dfile != NULL)
{
sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile);
sprintf(line,"gencat ./.dt_dfile.cat %s",dfile);
if ( system(line) != 0 )
{
fatal("default .tmsg file would not gencat\n",0,9);