From ce93b8c5acec8674d5b1a96f19ad5196366e7454 Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Thu, 1 Jun 2000 10:45:09 +0000
Subject: [PATCH] [project @ 2000-06-01 10:45:09 by panne] The DocBook saga
continues: Look for already installed catalog first.
---
configure.in | 2 +-
glafp-utils/docbook/db2dvi.dir/Makefile | 4 +---
glafp-utils/docbook/db2dvi.dir/db2dvi.sh | 3 ---
glafp-utils/docbook/db2html.dir/Makefile | 3 +--
glafp-utils/docbook/db2html.dir/db2html.sh | 3 ---
glafp-utils/docbook/db2pdf.dir/Makefile | 4 +---
glafp-utils/docbook/db2pdf.dir/db2pdf.sh | 3 ---
glafp-utils/docbook/db2ps.dir/Makefile | 3 ---
glafp-utils/docbook/db2ps.dir/db2ps.sh | 5 +++--
glafp-utils/docbook/db2rtf.dir/Makefile | 4 +---
glafp-utils/docbook/db2rtf.dir/db2rtf.sh | 3 ---
mk/config.mk.in | 10 +++++-----
12 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/configure.in b/configure.in
index a58eda241d5d..436a4d0d81dd 100644
--- a/configure.in
+++ b/configure.in
@@ -491,7 +491,7 @@ AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
dnl ** check for jade/openjade & determine a working catalog
AC_PATH_PROGS(JadeCmd,openjade jade,jade)
FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl,
- glafp-utils/docbook/CATALOG*)
+ /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
if test -z "$Catalog"; then
AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
fi
diff --git a/glafp-utils/docbook/db2dvi.dir/Makefile b/glafp-utils/docbook/db2dvi.dir/Makefile
index e4cbeead7afe..5883b3f6d8d7 100644
--- a/glafp-utils/docbook/db2dvi.dir/Makefile
+++ b/glafp-utils/docbook/db2dvi.dir/Makefile
@@ -3,11 +3,9 @@ include $(TOP)/mk/boilerplate.mk
SCRIPT_PROG=../db2dvi
SCRIPT_OBJS=db2dvi.sh
-SCRIPT_SUBST_VARS=JADE FPTOOLS_CATALOG_FILE
+SCRIPT_SUBST_VARS=JADE DOCBOOK_CATALOG
INTERP=$(SHELL)
-FPTOOLS_CATALOG_FILE = $(FPTOOLS_TOP_ABS)/glafp-utils/docbook/CATALOG
-
CLEAN_FILES += $(SCRIPT_PROG)
DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
index fa9dcd6497a9..dc847cc1e79e 100644
--- a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
+++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
@@ -1,6 +1,3 @@
-DOCBOOK_CATALOG=$1
-shift
-
if [ ! -f "$DOCBOOK_CATALOG" ] ; then
echo "CATALOG file not set up; see installation guide for details."
exit 1
diff --git a/glafp-utils/docbook/db2html.dir/Makefile b/glafp-utils/docbook/db2html.dir/Makefile
index 798c97be50a9..0780daf2673d 100644
--- a/glafp-utils/docbook/db2html.dir/Makefile
+++ b/glafp-utils/docbook/db2html.dir/Makefile
@@ -3,11 +3,10 @@ include $(TOP)/mk/boilerplate.mk
SCRIPT_PROG=../db2html
SCRIPT_OBJS=db2html.sh
-SCRIPT_SUBST_VARS=JADE FPTOOLS_CATALOG_FILE HTML_DIR
+SCRIPT_SUBST_VARS=JADE DOCBOOK_CATALOG HTML_DIR
INTERP=$(SHELL)
HTML_DIR=$(FPTOOLS_TOP_ABS)/glafp-utils/docbook
-FPTOOLS_CATALOG_FILE = $(FPTOOLS_TOP_ABS)/glafp-utils/docbook/CATALOG
CLEAN_FILES += $(SCRIPT_PROG)
DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
index 6cdae0e26d43..421fa2e14c35 100644
--- a/glafp-utils/docbook/db2html.dir/db2html.sh
+++ b/glafp-utils/docbook/db2html.dir/db2html.sh
@@ -1,6 +1,3 @@
-DOCBOOK_CATALOG=$1
-shift
-
if [ ! -f "$DOCBOOK_CATALOG" ] ; then
echo "CATALOG file not set up; see installation guide for details."
exit 1
diff --git a/glafp-utils/docbook/db2pdf.dir/Makefile b/glafp-utils/docbook/db2pdf.dir/Makefile
index 1d574af51274..0af0fa17b47a 100644
--- a/glafp-utils/docbook/db2pdf.dir/Makefile
+++ b/glafp-utils/docbook/db2pdf.dir/Makefile
@@ -3,11 +3,9 @@ include $(TOP)/mk/boilerplate.mk
SCRIPT_PROG=../db2pdf
SCRIPT_OBJS=db2pdf.sh
-SCRIPT_SUBST_VARS=JADE FPTOOLS_CATALOG_FILE
+SCRIPT_SUBST_VARS=JADE DOCBOOK_CATALOG
INTERP=$(SHELL)
-FPTOOLS_CATALOG_FILE = $(FPTOOLS_TOP_ABS)/glafp-utils/docbook/CATALOG
-
CLEAN_FILES += $(SCRIPT_PROG)
DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 3dab6742f4fc..40a6d698808c 100644
--- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,6 +1,3 @@
-DOCBOOK_CATALOG=$1
-shift
-
if [ ! -f "$DOCBOOK_CATALOG" ] ; then
echo "CATALOG file not set up; see installation guide for details."
exit 1
diff --git a/glafp-utils/docbook/db2ps.dir/Makefile b/glafp-utils/docbook/db2ps.dir/Makefile
index 368f7ae49348..82b13bee154b 100644
--- a/glafp-utils/docbook/db2ps.dir/Makefile
+++ b/glafp-utils/docbook/db2ps.dir/Makefile
@@ -3,11 +3,8 @@ include $(TOP)/mk/boilerplate.mk
SCRIPT_PROG=../db2ps
SCRIPT_OBJS=db2ps.sh
-SCRIPT_SUBST_VARS=JADE FPTOOLS_CATALOG_FILE
INTERP=$(SHELL)
-FPTOOLS_CATALOG_FILE = $(FPTOOLS_TOP_ABS)/glafp-utils/docbook/CATALOG
-
CLEAN_FILES += $(SCRIPT_PROG)
DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/docbook/db2ps.dir/db2ps.sh b/glafp-utils/docbook/db2ps.dir/db2ps.sh
index 30e596510f31..90e7cf4a0602 100644
--- a/glafp-utils/docbook/db2ps.dir/db2ps.sh
+++ b/glafp-utils/docbook/db2ps.dir/db2ps.sh
@@ -8,9 +8,10 @@ fi
output="`echo $1 | sed 's,\.sgml$,.ps,;s,\.sgm$,.ps,'`"
outdvi="`echo $1 | sed 's,\.sgml$,.dvi,;s,\.sgm$,.dvi,'`"
-db2dvi $1
+db2dvi "$@"
dvips $outdvi -o $output
+# SUP: What's this stuff below???
exit 0
if [ $# -eq 1 ]
@@ -31,7 +32,7 @@ then
fi
fi
-db2dvi $1
+db2dvi "$@"
if [ ! -f ${TMPFN}.dvi ]
then
diff --git a/glafp-utils/docbook/db2rtf.dir/Makefile b/glafp-utils/docbook/db2rtf.dir/Makefile
index 022d9ddcb630..8c48a88d69b9 100644
--- a/glafp-utils/docbook/db2rtf.dir/Makefile
+++ b/glafp-utils/docbook/db2rtf.dir/Makefile
@@ -3,11 +3,9 @@ include $(TOP)/mk/boilerplate.mk
SCRIPT_PROG=../db2rtf
SCRIPT_OBJS=db2rtf.sh
-SCRIPT_SUBST_VARS=JADE FPTOOLS_CATALOG_FILE
+SCRIPT_SUBST_VARS=JADE DOCBOOK_CATALOG
INTERP=$(SHELL)
-FPTOOLS_CATALOG_FILE = $(FPTOOLS_TOP_ABS)/glafp-utils/docbook/CATALOG
-
CLEAN_FILES += $(SCRIPT_PROG)
DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 947775f02c36..9ed7e8f8586b 100644
--- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,6 +1,3 @@
-DOCBOOK_CATALOG=$1
-shift
-
if [ ! -f "$DOCBOOK_CATALOG" ] ; then
echo "CATALOG file not set up; see installation guide for details."
exit 1
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8b5879e72167..66fe0936022e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -650,12 +650,12 @@ SGML2RTF = $(DOCBOOK_PREFIX)db2rtf
SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
-SRC_SGML2DVI_OPTS = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2HTML_OPTS = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2PS_OPTS = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2RTF_OPTS = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
+SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET)
+SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET)
+SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET)
+SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET)
-DOCBOOK_CATALOG = $(FPTOOLS_TOP_ABS)/@Catalog@
+DOCBOOK_CATALOG = @Catalog@
#-----------------------------------------------------------------------------
# FPtools support software
--
GitLab