diff --git a/cde/programs/dtdocbook/Makefile.am b/cde/programs/dtdocbook/Makefile.am index ef8956f7b..b6d352f8e 100644 --- a/cde/programs/dtdocbook/Makefile.am +++ b/cde/programs/dtdocbook/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = doc_utils dtsr instant locales sgml spec tcl tpt +SUBDIRS = dtsr infolib instant locales sgml spec tcl tpt doc_utils include dtdocbook.am @@ -10,5 +10,5 @@ bin_PROGRAMS = dtdocbook2infolib AM_LDFLAGS = $(XTOOLLIB) $(DTCLIENTLIBS) dtdocbook2infolib_CPPFLAGS = \ - -DDTDCBK_DATAROOTDIR=\"$(dtdcbk_datarootdir)\" \ - -DINFOLIB_LIBEXECDIR=\"$(PWD)\" + -DDTDCBK_DATAROOTDIR=\"$(dtdocbookdatadir)\" \ + -DINFOLIB_LIBEXECDIR=\"$(dtdocbooklibexecdir)/infolib\" diff --git a/cde/programs/dtdocbook/dtdocbook2sdl.in b/cde/programs/dtdocbook/dtdocbook2sdl.in index ece0beee1..e56d18131 100755 --- a/cde/programs/dtdocbook/dtdocbook2sdl.in +++ b/cde/programs/dtdocbook/dtdocbook2sdl.in @@ -94,6 +94,8 @@ default_locale="en_US.$default_charset" prefix="${prefix:-@prefix@}" exec_prefix="@exec_prefix@" +export PATH="${PATH}:@bindir@" + dcbk_name="@PACKAGE_TARNAME@/dtdocbook" dtdcbk_libdir="${dtdcbk_libdir:-@libdir@/${dcbk_name}}" diff --git a/cde/programs/dtdocbook/instant/Makefile.am b/cde/programs/dtdocbook/instant/Makefile.am index 33d28b761..784904ce5 100644 --- a/cde/programs/dtdocbook/instant/Makefile.am +++ b/cde/programs/dtdocbook/instant/Makefile.am @@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in include ../dtdocbook.am -dtdocbooklibexec_PROGRAMS = instant +instantdir = $(dtdocbooklibexecdir)/instant + +instant_PROGRAMS = instant instant_CFLAGS = $(DT_INCDIR) diff --git a/cde/programs/dtdocbook/tpt/docbook-to-man.ts b/cde/programs/dtdocbook/tpt/docbook-to-man.ts index ecce4085d..8ec7d4afa 100644 --- a/cde/programs/dtdocbook/tpt/docbook-to-man.ts +++ b/cde/programs/dtdocbook/tpt/docbook-to-man.ts @@ -54,7 +54,7 @@ Var: procsubstep 0 # GI: REFENTRY StartText: ^.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n - ^.TH "@{_followrel descendant REFENTRYTITLE 1000}" + ^.TH "@{_followrel descendant REFENTRYTITLE 1000}" "@{_followrel descendant MANVOLNUM 1000}"^ EndText: ^...\\" created by instant / docbook-to-man, @{date}^ -