From 5f7eda2b335e91401f4a4f01d4acef081c33860a Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 9 Nov 2021 15:39:33 -0700
Subject: [PATCH] doc: get utils to build

---
 cde/Makefile.am                          |  3 +--
 cde/configure.ac                         |  8 ++++++++
 cde/doc/C/Makefile.am                    | 19 ++++++++++---------
 cde/doc/Makefile.am                      | 20 +++++++++-----------
 cde/doc/util/dbtoman/instant/Makefile.am |  4 ++--
 5 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/cde/Makefile.am b/cde/Makefile.am
index 8870696b5..979916117 100644
--- a/cde/Makefile.am
+++ b/cde/Makefile.am
@@ -9,6 +9,5 @@ MAINTAINERCLEANFILES = Makefile.in \
 		config.h.in \
 		install-sh
 
-SUBDIRS = util lib programs include
+SUBDIRS = util lib programs include doc
 
-#NOTYET: doc
diff --git a/cde/configure.ac b/cde/configure.ac
index 8865a04a6..38eefbd21 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -772,6 +772,14 @@ programs/localized/es_ES.UTF-8/palettes/Makefile
 programs/localized/es_ES.UTF-8/msg/Makefile
 programs/localized/es_ES.UTF-8/appmanager/Makefile
 
+doc/Makefile
+doc/util/Makefile
+doc/util/dbtoman/Makefile
+doc/util/dbtoman/instant/Makefile
+
+doc/C/Makefile
+
+
 include/Makefile
 
 ])
diff --git a/cde/doc/C/Makefile.am b/cde/doc/C/Makefile.am
index cb47bbf86..27a9767d5 100644
--- a/cde/doc/C/Makefile.am
+++ b/cde/doc/C/Makefile.am
@@ -1,13 +1,14 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-all:
-	$(MKDIR_P) help-sdl
-	$(MKDIR_P) cde.dti
-	$(MKDIR_P) m-guides/common
-	$(LN_S) ../../guides/common/ManLinksMotif.sgm \
-	m-guides/common/ManLinks.sgm
+#all:
+#	$(MKDIR_P) help-sdl
+#	$(MKDIR_P) cde.dti
+#	$(MKDIR_P) m-guides/common
+#	$(LN_S) ../../guides/common/ManLinksMotif.sgm \
+#	m-guides/common/ManLinks.sgm
 
-SUBDIRS = man guides help
+SUBDIRS = help
+# NOTYET = man guides 
 
-clean::
-        $(RM) -r help-sdl cde.dti
+#clean::
+#        $(RM) -r help-sdl cde.dti
diff --git a/cde/doc/Makefile.am b/cde/doc/Makefile.am
index ebdce3413..d674eb1e7 100644
--- a/cde/doc/Makefile.am
+++ b/cde/doc/Makefile.am
@@ -1,10 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = util C
-
-if JAPANESE
-SUBDIRS += ja_JP.dt-eucJP
-endif
+#SUBDIRS = util C
+SUBDIRS = util 
 
 if GERMAN
 SUBDIRS += de_DE.ISO8859-1
@@ -19,12 +16,13 @@ SUBDIRS += es_ES.ISO8859-1
 endif
 
 if ITALIAN
-SUBDIRS = it_IT.ISO8859-1
+SUBDIRS += it_IT.ISO8859-1
 endif
 
-all::
-	$(RM) -r tmp
-	$(MKDIR_P) tmp
+# JET - these are related to dtinfogen which should be tackled later
+#all::
+#	$(RM) -r tmp
+#	$(MKDIR_P) tmp
 
-clean::
-	$(RM) -r tmp
+#clean::
+#	$(RM) -r tmp
diff --git a/cde/doc/util/dbtoman/instant/Makefile.am b/cde/doc/util/dbtoman/instant/Makefile.am
index d52e71acc..44e3c19db 100644
--- a/cde/doc/util/dbtoman/instant/Makefile.am
+++ b/cde/doc/util/dbtoman/instant/Makefile.am
@@ -2,9 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_PROGRAMS = instant
 
-instant_CFLAGS = -I$(srcdir)/programs/dtdocbook/lib/tptregexp
+instant_CFLAGS = -I$(top_builddir)/programs/dtdocbook/lib/tptregexp
 
-instant_LDFLAGS = -L$(srcdir)/programs/dtdocbook/lib/tptregexp -ltptregexp
+instant_LDADD = $(top_builddir)/programs/dtdocbook/lib/tptregexp/libtptregexp.a
 
 instant_SOURCES = main.c util.c info.c translate.c traninit.c tranvar.c \
 		  tables.c browse.c