[project @ 2000-05-12 16:49:42 by rrt]

Reorganisation to parametrise *.sh files on name of Jade, which is
now found by the configure script.

diff --git a/glafp-utils/docbook/Makefile b/glafp-utils/docbook/Makefile
index 206c5ab..724e437 100644 (file)
--- a/glafp-utils/docbook/Makefile
+++ b/glafp-utils/docbook/Makefile
@@ -1,14 +1,6 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SCRIPT_PROG=db2html
-SCRIPT_OBJS=db2html.sh
-SCRIPT_SUBST_VARS=HTML_DIR
-INTERP=$(SHELL)
-
-HTML_DIR=$(FPTOOLS_TOP_ABS)/glafp-utils/docbook
-
-CLEAN_FILES += $(SCRIPT_PROG)
-DESTDIR=$(INSTSCRIPTDIR)
+SUBDIRS = db2dvi.dir db2html.dir db2pdf.dir db2ps.dir db2rtf.dir
 
 include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2dvi.dir/Makefile b/glafp-utils/docbook/db2dvi.dir/Makefile
new file mode 100644 (file)
index 0000000..cc2ca2f
--- /dev/null
+++ b/glafp-utils/docbook/db2dvi.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2dvi
+SCRIPT_OBJS=db2dvi.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2dvi b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
similarity index 93%
rename from glafp-utils/docbook/db2dvi
rename to glafp-utils/docbook/db2dvi.dir/db2dvi.sh
index e18bc5e..1450ce1 100644 (file)
--- a/glafp-utils/docbook/db2dvi
+++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
@@ -32,7 +32,7 @@ echo OUTPUT FILE NAME IS $output
 
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
-jade -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
 
 jadetex ${TMPFN}.tex
 

diff --git a/glafp-utils/docbook/db2html.dir/Makefile b/glafp-utils/docbook/db2html.dir/Makefile
new file mode 100644 (file)
index 0000000..4ac0374
--- /dev/null
+++ b/glafp-utils/docbook/db2html.dir/Makefile
@@ -0,0 +1,14 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2html
+SCRIPT_OBJS=db2html.sh
+SCRIPT_SUBST_VARS=JADE HTML_DIR
+INTERP=$(SHELL)
+
+HTML_DIR=$(FPTOOLS_TOP_ABS)/glafp-utils/docbook
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
similarity index 100%
rename from glafp-utils/docbook/db2html.sh
rename to glafp-utils/docbook/db2html.dir/db2html.sh

diff --git a/glafp-utils/docbook/db2pdf.dir/Makefile b/glafp-utils/docbook/db2pdf.dir/Makefile
new file mode 100644 (file)
index 0000000..9067880
--- /dev/null
+++ b/glafp-utils/docbook/db2pdf.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2pdf
+SCRIPT_OBJS=db2pdf.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2pdf b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
similarity index 88%
rename from glafp-utils/docbook/db2pdf
rename to glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 1c1e5dc..2d0b4cc 100644 (file)
--- a/glafp-utils/docbook/db2pdf
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
 # Dave Mason's option to specify a different stylesheet
@@ -30,9 +28,9 @@ then
   fi
 fi
 
-jade -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
 
-pdfjadetex $TMPFN
+pdf$JADEtex $TMPFN
 
 if egrep '^LaTeX Warning: There were undefined references.$' ${TMPFN}.log >/dev/null 2>&1
 then

diff --git a/glafp-utils/docbook/db2ps.dir/Makefile b/glafp-utils/docbook/db2ps.dir/Makefile
new file mode 100644 (file)
index 0000000..9bfcdbc
--- /dev/null
+++ b/glafp-utils/docbook/db2ps.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2ps
+SCRIPT_OBJS=db2ps.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2ps b/glafp-utils/docbook/db2ps.dir/db2ps.sh
similarity index 98%
rename from glafp-utils/docbook/db2ps
rename to glafp-utils/docbook/db2ps.dir/db2ps.sh
index 9cbe5f4..30e5965 100644 (file)
--- a/glafp-utils/docbook/db2ps
+++ b/glafp-utils/docbook/db2ps.dir/db2ps.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 TMPFN=db2pstmp$$
 
 if [ $# -gt 2 ]

diff --git a/glafp-utils/docbook/db2rtf.dir/Makefile b/glafp-utils/docbook/db2rtf.dir/Makefile
new file mode 100644 (file)
index 0000000..92669f4
--- /dev/null
+++ b/glafp-utils/docbook/db2rtf.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2rtf
+SCRIPT_OBJS=db2rtf.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk

diff --git a/glafp-utils/docbook/db2rtf b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
similarity index 83%
rename from glafp-utils/docbook/db2rtf
rename to glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 9812874..1353554 100644 (file)
--- a/glafp-utils/docbook/db2rtf
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 output=db2rtf.rtf
 
 # Dave Mason's option to specify a different stylesheet
@@ -30,13 +28,13 @@ then
   fi
 fi
 
-cat $* | jade -t rtf -d ${DB_STYLESHEET}\#print
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print
 
 if [ $# -eq 1 ]
 then
-  mv jade-out.rtf $output
+  mv $JADE-out.rtf $output
 else
-  cat jade-out.rtf
+  cat $JADE-out.rtf
 fi
 
 exit 0