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

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

Browse Source
This commit is contained in:
Jon Trulson
2019-11-16 16:35:56 -07:00
parent 371bc9aa07 9753b63dab
commit 82059bf240
25 changed files with 610 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
View File

@@ -30,8 +30,6 @@
#
###############################################################################
USERPATH=$PATH
PATH=/bin:/usr/bin:/usr/sbin
RETCODE=0
trap '\
@@ -45,7 +43,7 @@ trap '\
#
###############################################################################
export ARCH DTINFO_HOME OTK_NAME PATH
export ARCH DTINFO_HOME OTK_NAME
###############################################################################
@@ -361,8 +359,6 @@ if [ ! -d $DTINFO_LIB ] ; then
fi
PATH=${PATH}:${USERPATH}
###############################################################################
#
# Create the command line and invoke the DtInfo build tools

2
cde/programs/dtprintinfo/Imakefile
View File

@@ -72,7 +72,7 @@ ComplexCplusplusProgramTarget(dtprintinfo)
dtprintinfo_msg.h dtprintinfo.msg: dtprintinfo.msg.src
rm -f dtprintinfo_msg.h dtprintinfo.msg
$(SYM2NUM_CMD) dtprintinfo dtprintinfo.msg.src> dtprintinfo.msg
CPP="$(CPP)" $(SYM2NUM_CMD) dtprintinfo dtprintinfo.msg.src> dtprintinfo.msg
dtprintinfo_cat.h: dtprintinfo.msg.src
rm -f dtprintinfo_cat.h

15
cde/programs/dtprintinfo/sym2num
View File

@@ -53,21 +53,8 @@ awk '/^\$set/ { SET_NAME=$2; SET_COUNT++; MES_COUNT=0;
# There are two differences between sym2num and mkcatdefs: sym2num
# does not create a $delset line, and sym2num converts all symbols
# to numbers, even those in comment statements.
if [[ -f /usr/ccs/lib/cpp ]] #IBM & SUN
then
cpp_path=/usr/ccs/lib
elif [[ -f /usr/libexec/cpp ]] #BSD
then
cpp_path=/usr/libexec
elif [[ -f /usr/bin/cpp ]] #BSD
then
cpp_path=/usr/bin
elif [[ -f /lib/cpp ]] #HP
then
cpp_path=/lib
fi
( cat ${inc_file} | sed -n /define/p ; cat ${SOURCE_FILE} ) | \
${cpp_path}/cpp -P | sed -e '/^$/d' -e 's/^\$$/\$ /' \
${CPP:-/lib/cpp} -P | sed -e '/^$/d' -e 's/^\$$/\$ /' \
-e 's/\"\"$/\"/' -e 's/XDQUOTE/\"/' -e "s/XSQUOTE/\'/" \
-e 's/^\([1-9][0-9]*\)[ ]*[\"]*\(\"\)\(.*\)/\1 \2\3/'

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