From 93a3d73ef7df917bb10eb38ce63be1477d3b1fde Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Mon, 6 Dec 2021 11:59:00 -0700
Subject: [PATCH] dtinfo: install required stuff, also in localized/

---
 cde/programs/dtinfo/DtMmdb/Makefile.am        |  5 +++++
 .../dtinfo/clients/dtinfo_start/Makefile.am   |  2 +-
 .../dtinfo/dtinfo/install/lib/Makefile.am     |  2 +-
 .../localized/templates/app-defaults.am       |  4 ++--
 cde/programs/localized/templates/msg.C.am     | 20 +++++++++----------
 cde/programs/localized/util/merge.c           |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am
index b1f37673c..0951c53aa 100644
--- a/cde/programs/dtinfo/DtMmdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/Makefile.am
@@ -27,3 +27,8 @@ libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \
 		      utility/libutility.la
 
 libDtMmdb_la_LDFLAGS = -version-info 2:1:0
+
+infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
+infolib_DATA = oliasdb/mmdb.infolib.spec	\
+	StyleSheet/hardcopy.feature.spec	\
+	StyleSheet/online.feature.spec
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
index f8c8cdd3f..b19afee3e 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
+++ b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = dtinfo_start
 
 BUILT_SOURCES = dtinfo_start.opnums
 
-dtinfo_start_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -lXm
+dtinfo_start_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 dtinfo_start.opnums: $(top_builddir)/programs/tttypes/dtinfo_start.opnums
 	$(RM) dtinfo_start.opnums
diff --git a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
index b1a92efb0..bde9efe87 100644
--- a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
@@ -4,5 +4,5 @@ etcdir = $(CDE_CONFIGURATION_TOP)
 
 SUBDIRS = bitmaps fonts
 
-infolibdir = $(CDE_INSTALLATION_TOP)/infolib
+infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
 infolib_DATA = mmdb.mark.spec
diff --git a/cde/programs/localized/templates/app-defaults.am b/cde/programs/localized/templates/app-defaults.am
index 67c5c5a58..4bae23aee 100644
--- a/cde/programs/localized/templates/app-defaults.am
+++ b/cde/programs/localized/templates/app-defaults.am
@@ -1,10 +1,10 @@
 # process the app-defaults files...
 
-#NOTYET - Dtinfo 
+
 
 BUILT_SOURCES = Dthelpview Dtimsstart Dtlogin Dthello Dtsession		\
 	Dtscreen Dtwm Dtfile Dtstyle Dtpad Dticon Dtcreate Dtcalc	\
-	Dtcm Dtterm Dtmail Dtbuilder Dtudcfonted Dt
+	Dtcm Dtterm Dtmail Dtbuilder Dtudcfonted Dt Dtinfo
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/cde/programs/localized/templates/msg.C.am b/cde/programs/localized/templates/msg.C.am
index f6d7f8b55..5929b3302 100644
--- a/cde/programs/localized/templates/msg.C.am
+++ b/cde/programs/localized/templates/msg.C.am
@@ -1,19 +1,17 @@
 # process the message files...
 
-# NOTYET dtinfo.cat dtinfo_start.cat
-
 # BROKEN (always has been): fmt_tbl.cat
 
-BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat 		\
-      DtMail.cat DtPrint.cat DtWidget.cat MotifApp.cat			\
-      SUNW_TOOLTALK.cat dt.cat dtact.cat dtbuilder.cat dtcalc.cat	\
-      dtcm.cat dtcodegen.cat dtconfig.cat dtcopy.cat dtcreate.cat	\
-      dtfile.cat dthello.cat dthelpgen.cat dthelpprint.cat dticon.cat	\
-      dtimsstart.cat dtksh.cat		\
-      dtlogin.cat dtlp.cat dtmailopts.cat dtpad.cat dtpdm.cat		\
-      dtpdmd.cat dtprintinfo.cat dtscreen.cat dtsearch.cat		\
+BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat DtMail.cat		\
+      DtPrint.cat DtWidget.cat MotifApp.cat SUNW_TOOLTALK.cat dt.cat	\
+      dtact.cat dtbuilder.cat dtcalc.cat dtcm.cat dtcodegen.cat		\
+      dtconfig.cat dtcopy.cat dtcreate.cat dtfile.cat dthello.cat	\
+      dthelpgen.cat dthelpprint.cat dticon.cat dtimsstart.cat		\
+      dtksh.cat dtlogin.cat dtlp.cat dtmailopts.cat dtpad.cat		\
+      dtpdm.cat dtpdmd.cat dtprintinfo.cat dtscreen.cat dtsearch.cat	\
       dtsession.cat dtstyle.cat dtterm.cat dttypes.cat dtwm.cat		\
-      dtudcexch.cat dtudcfonted.cat libdtcm.cat libDtMail.cat
+      dtudcexch.cat dtudcfonted.cat libdtcm.cat libDtMail.cat		\
+      dtinfo.cat dtinfo_start.cat
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c
index e019dab37..000843d09 100644
--- a/cde/programs/localized/util/merge.c
+++ b/cde/programs/localized/util/merge.c
@@ -259,7 +259,7 @@ void cat_open (void)
 
     if(dfile != NULL)
     {
-        sprintf(line,"gencat %s %s", dFilename, dfile);
+        snprintf(line, PATH_MAX, "gencat %s %s", dFilename, dfile);
         if ( system(line) != 0 )
 	{
            fatal("default .tmsg file would not gencat\n",0,9);