From e4e8b323c73ef42d9bdd6f36dc2f71c26e706109 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sat, 14 Dec 2019 19:58:34 -0700
Subject: [PATCH] localized: use proper mkcatdefs for the Motif catalogs

---
 cde/programs/localized/templates/msg.C.am | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cde/programs/localized/templates/msg.C.am b/cde/programs/localized/templates/msg.C.am
index 7469aeeb..f6d7f8b5 100644
--- a/cde/programs/localized/templates/msg.C.am
+++ b/cde/programs/localized/templates/msg.C.am
@@ -24,17 +24,25 @@ TOP = $(top_builddir)/programs
 TOPLIB = $(top_builddir)/lib
 TOPMOTIF = $(top_builddir)/imports/
 
+MKCATDEFS = $(TOP)/localized/util/mkcatdefs
+
 Xm.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Xm.msg
 	$(RM) $@
-	LANG=C $(GENCAT) $@ $^ || $(RM) $@
+	$(MKCATDEFS) Xm $^ -h > Xm.tmp.msg
+	LANG=C $(GENCAT) $@ Xm.tmp.msg || $(RM) $@
+	$(RM) Xm.tmp.msg
 
 Mrm.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Mrm.msg
 	$(RM) $@
-	LANG=C $(GENCAT) $@ $^ || $(RM) $@
+	$(MKCATDEFS) Mrm $^ -h > Mrm.tmp.msg
+	LANG=C $(GENCAT) $@ Mrm.tmp.msg || $(RM) $@
+	$(RM) Mrm.tmp.msg
 
 Uil.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Uil.msg
 	$(RM) $@
-	LANG=C $(GENCAT) $@ $^ || $(RM) $@
+	$(MKCATDEFS) Uil $^ -h > Uil.tmp.msg
+	LANG=C $(GENCAT) $@ Uil.tmp.msg || $(RM) $@
+	$(RM) Uil.tmp.msg
 
 DtHelp.cat: $(TOPLIB)/DtHelp/DtHelp.msg
 	$(RM) $@
-- 
2.25.1