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

2019-11-16 16:34:48 -07:00
parent 2e4deb41c0 9753b63dab
commit ba68ff0a17
152 changed files with 770 additions and 18307 deletions
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -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) \			@@\
 	)								@@\