From 349802ddd3fcc3b6b98a98fcc133300a73ae31c5 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Mon, 13 Apr 2020 16:21:27 -0600
Subject: [PATCH] dthelpprint: make it build.

---
 cde/configure.ac                              |  1 +
 cde/lib/DtHelp/HelpXlate.h                    |  4 ++--
 cde/programs/dthelp/Makefile.am               |  4 ++--
 cde/programs/dthelp/dthelpprint/Makefile.am   | 12 ++++++++----
 cde/programs/dthelp/dthelpprint/PrintTopics.c | 12 +++++++-----
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index 77159e9b..a8a66bf9 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -513,6 +513,7 @@ programs/dthelp/Makefile
 programs/dthelp/dthelpview/Makefile
 programs/dthelp/dthelpgen/Makefile
 programs/dthelp/dthelpdemo/Makefile
+programs/dthelp/dthelpprint/Makefile
 
 programs/nsgmls/Makefile
 
diff --git a/cde/lib/DtHelp/HelpXlate.h b/cde/lib/DtHelp/HelpXlate.h
index 89908b29..af212c74 100644
--- a/cde/lib/DtHelp/HelpXlate.h
+++ b/cde/lib/DtHelp/HelpXlate.h
@@ -41,8 +41,8 @@
 #ifndef _DtHELP_XLATE_I
 #define _DtHELP_XLATE_I
 
-#include <LocaleXlate.h>
-#include <XlationSvc.h>
+#include <Dt/LocaleXlate.h>
+#include <Dt/XlationSvc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cde/programs/dthelp/Makefile.am b/cde/programs/dthelp/Makefile.am
index 810da52f..970aa411 100644
--- a/cde/programs/dthelp/Makefile.am
+++ b/cde/programs/dthelp/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = dthelpview dthelpgen dthelpdemo
+SUBDIRS = dthelpview dthelpgen dthelpdemo dthelpprint
 
-#NOTYET  = parser dthelpprint
+#NOTYET  = parser 
diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index 7ee85f0e..8dca0213 100644
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -1,9 +1,13 @@
-bin_PROGRAMS = dthelpprint dthelpprint.sh
+MAINTAINERCLEANFILES = Makefile.in
 
-dthelpprint_CPPFLAGS = -I.. -DCDE_CONFIGURATION_TOP='"${prefix}"' \
-		     -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"'
+bin_PROGRAMS = dthelpprint
+bin_SCRIPTS =  dthelpprint.sh
 
-dthelpprint_LDADD = $(LIBSVC) $(LIBTT) $(LIBHELP) $(XTOOLLIB) ${X_LIBS}
+dthelpprint_CPPFLAGS = -I.. -I ../../../lib/DtHelp \
+	-DCDE_CONFIGURATION_TOP='"${prefix}"' \
+	-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"'
+
+dthelpprint_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dthelpprint_LDADD += -lw -ldl -lgen -lm
diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c
index 0d9959b9..6ef36ca4 100644
--- a/cde/programs/dthelp/dthelpprint/PrintTopics.c
+++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c
@@ -58,15 +58,17 @@ $COPYRIGHT$:
 
 #include <time.h>
 
+
 #include "HelpPrintI.h"  /* helpprint */
 
-#include "HelpTermP.h"	/* from libDtHelp */
-#include "CanvasP.h"	/* from libDtHelp */
+#include "DtI/HelpTermP.h"	/* from libDtHelp */
+#include "Dt/CanvasP.h"	/* from libDtHelp */
 #include "StringFuncsI.h" /* from libDtHelp */
-#include "LocaleXlate.h" /* from libDtHelp */
-#include "bufioI.h" /* from libDtHelp; required for AccessI.h */
-#include "FileUtilsI.h" /* from libDtHelp */
+#include "Dt/LocaleXlate.h" /* from libDtHelp */
+#include "DtI/bufioI.h" /* from libDtHelp; required for AccessI.h */
+#include "DtI/FileUtilsI.h" /* from libDtHelp */
 #include "GenUtilsP.h" /* from libDtHelp */
+#include "HelpXlate.h" /* from libDtHelp */
 
 /*#include "AccessI.h" ** from libDtHelp */
 /* I can't include AccessI.h because it redefines the Boolean type,
-- 
2.25.1