mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
sym2num: don't hardcode path to cpp
This commit is contained in:
parent
de7fe55d6a
commit
f75ee32e72
3 changed files with 3 additions and 16 deletions
|
@ -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
|
||||
|
|
|
@ -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/'
|
||||
|
||||
|
|
|
@ -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) \ @@\
|
||||
) @@\
|
||||
|
|
Loading…
Reference in a new issue