The ARM and the man pages now use a common set of Makefile macros

to determine the paths to the various SGML and XML tools and files.
You should have a complete SGML catalog in /usr/local/share/sgml/catalog;
this will be picked up by the configure script and used for both the
ARM and the man pages.
This commit is contained in:
Andreas Gustafsson 2001-05-15 17:33:32 +00:00
parent fcb8414300
commit 60084a1a5a
10 changed files with 177 additions and 123 deletions

View file

@ -12,9 +12,6 @@
.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" $Id: named-checkconf.8,v 1.6 2001/04/10 21:50:18 bwelling Exp $
.TH "NAMED-CHECKCONF" "8" "June 14, 2000" "BIND9" ""
.SH NAME
named-checkconf \- named configuration file syntax checking tool

View file

@ -12,9 +12,6 @@
.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" $Id: named-checkzone.8,v 1.6 2001/04/10 21:50:21 bwelling Exp $
.TH "NAMED-CHECKZONE" "8" "June 13, 2000" "BIND9" ""
.SH NAME
named-checkzone \- zone file validity checking tool

View file

@ -20,7 +20,7 @@
>lwresd</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.63
CONTENT="Modular DocBook HTML Stylesheet Version 1.61
"></HEAD
><BODY
CLASS="REFENTRY"

View file

@ -20,7 +20,7 @@
>named</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.63
CONTENT="Modular DocBook HTML Stylesheet Version 1.61
"></HEAD
><BODY
CLASS="REFENTRY"

131
configure vendored
View file

@ -5150,24 +5150,24 @@ esac
#
#
# Look for jade, preferring openjade if installed.
# Look for openjade. Plain jade is no longer supported.
#
for ac_prog in openjade jade
for ac_prog in openjade
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5162: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then
if eval "test \"`echo '$''{'ac_cv_path_OPENJADE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$JADE" in
case "$OPENJADE" in
/*)
ac_cv_path_JADE="$JADE" # Let the user override the test with a path.
ac_cv_path_OPENJADE="$OPENJADE" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_JADE="$JADE" # Let the user override the test with a dos path.
ac_cv_path_OPENJADE="$OPENJADE" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
@ -5175,7 +5175,7 @@ else
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_JADE="$ac_dir/$ac_word"
ac_cv_path_OPENJADE="$ac_dir/$ac_word"
break
fi
done
@ -5183,16 +5183,16 @@ else
;;
esac
fi
JADE="$ac_cv_path_JADE"
if test -n "$JADE"; then
echo "$ac_t""$JADE" 1>&6
OPENJADE="$ac_cv_path_OPENJADE"
if test -n "$OPENJADE"; then
echo "$ac_t""$OPENJADE" 1>&6
else
echo "$ac_t""no" 1>&6
fi
test -n "$JADE" && break
test -n "$OPENJADE" && break
done
test -n "$JADE" || JADE="jade"
test -n "$OPENJADE" || OPENJADE="openjade"
@ -5286,68 +5286,104 @@ test -n "$PDFTEX" || PDFTEX="pdftex"
echo $ac_n "checking for SGML catalog""... $ac_c" 1>&6
echo "configure:5291: checking for SGML catalog" >&5
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
f=$d/catalog
if test -f $f
then
SGMLCATALOG=$f
echo "$ac_t""$f" 1>&6
break
fi
done
if test "X$SGMLCATALOG" = "X"
then
echo "$ac_t"""not found"" 1>&6;
SGMLCATALOG=catalog
fi
#
# Look for SGML files. The location varies; so far we
# have seen:
# Look for the HTML stylesheet html/docbook.dsl, used for
# formatting man pages in HTML. Its location varies,
# so far we have seen:
#
# NetBSD /usr/pkg/share/docbook/dsssl/modular/
# FreeBSD /usr/local/share/docbook/dsssl/modular/
# Linux /usr/local/share/dsssl/docbook/
#
SGMLDIR=""
SGMLSTYLEDIR=""
echo $ac_n "checking for SGML files""... $ac_c" 1>&6
echo "configure:5303: checking for SGML files" >&5
for d in /usr/pkg/share/sgml /usr/local/share/sgml
HTMLSTYLE=""
echo $ac_n "checking for html/docbook.dsl""... $ac_c" 1>&6
echo "configure:5321: checking for html/docbook.dsl" >&5
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
for s in docbook/dsssl/modular dsssl/docbook
do
if test -f $d/$s/html/docbook.dsl
f=$d/$s/html/docbook.dsl
if test -f $f
then
SGMLDIR=$d
SGMLSTYLEDIR=$d/$s
echo "$ac_t""in $SGMLSTYLEDIR" 1>&6
HTMLSTYLE=$f
echo "$ac_t""$f" 1>&6
break
fi
done
done
if test "X$SGMLDIR" = "X"
if test "X$HTMLSTYLE" = "X"
then
echo "$ac_t"""not found"" 1>&6;
SGMLDIR=/usr/local/share/sgml
SGMLSTYLEDIR=/usr/local/share/docbook/dsssl/modular
HTMLSTYLE=docbook.dsl
fi
#
# Look for XML files.
# Look for XML declarations
#
XGMLDIR=""
echo $ac_n "checking for XML files""... $ac_c" 1>&6
echo "configure:5334: checking for XML files" >&5
for d in /usr/pkg/share/xml /usr/local/share/xml
XMLDCL=""
echo $ac_n "checking for xml.dcl""... $ac_c" 1>&6
echo "configure:5347: checking for xml.dcl" >&5
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
if test -f $d/dtd/docbook/docbookx.dtd
f=$d/docbook/dsssl/modular/dtds/decls/xml.dcl
if test -f $f
then
XMLDIR=$d
echo "$ac_t""in $XMLDIR" 1>&6
XMLDCL=$f
echo "$ac_t""$f" 1>&6
break
fi
done
if test "X$XMLDIR" = "X"
if test "X$XMLDCL" = "X"
then
echo "$ac_t"""not found"" 1>&6;
XMLDIR=/usr/local/share/xml
XMLDCL=xml.dcl
fi
#
# Look for the docbook2X directory
#
echo $ac_n "checking for docbook2X""... $ac_c" 1>&6
echo "configure:5370: checking for docbook2X" >&5
DOCBOOK2X=""
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
dd=$d/docbook2X
if test -f $dd/docbook2man-spec.pl
then
DOCBOOK2X=$dd
echo "$ac_t""$dd" 1>&6
break
fi
done
if test "X$DOCBOOK2X" = "X"
then
echo "$ac_t"""not found"" 1>&6;
DOCBOOK2X=.
fi
#
# Substitutions
@ -5566,7 +5602,6 @@ trap 'rm -fr `echo "make/rules
bin/dnssec/Makefile
doc/Makefile
doc/arm/Makefile
doc/arm/catalog
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh
@ -5698,12 +5733,13 @@ s%@ISC_EXTRA_SRCS@%$ISC_EXTRA_SRCS%g
s%@ISC_PLATFORM_QUADFORMAT@%$ISC_PLATFORM_QUADFORMAT%g
s%@ISC_PLATFORM_RLIMITTYPE@%$ISC_PLATFORM_RLIMITTYPE%g
s%@ISC_PLATFORM_BRACEPTHREADONCEINIT@%$ISC_PLATFORM_BRACEPTHREADONCEINIT%g
s%@JADE@%$JADE%g
s%@OPENJADE@%$OPENJADE%g
s%@TEX@%$TEX%g
s%@PDFTEX@%$PDFTEX%g
s%@SGMLDIR@%$SGMLDIR%g
s%@SGMLSTYLEDIR@%$SGMLSTYLEDIR%g
s%@XMLDIR@%$XMLDIR%g
s%@SGMLCATALOG@%$SGMLCATALOG%g
s%@HTMLSTYLE@%$HTMLSTYLE%g
s%@XMLDCL@%$XMLDCL%g
s%@DOCBOOK2X@%$DOCBOOK2X%g
s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g
s%@BIND9_ISC_BUILDINCLUDE@%$BIND9_ISC_BUILDINCLUDE%g
s%@BIND9_ISCCC_BUILDINCLUDE@%$BIND9_ISCCC_BUILDINCLUDE%g
@ -5832,7 +5868,6 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
bin/dnssec/Makefile
doc/Makefile
doc/arm/Makefile
doc/arm/catalog
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh

View file

@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.252 $)
AC_REVISION($Revision: 1.253 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
@ -1402,11 +1402,11 @@ esac
#
#
# Look for jade, preferring openjade if installed.
# Look for openjade. Plain jade is no longer supported.
#
AC_PATH_PROGS(JADE, openjade jade, jade)
AC_SUBST(JADE)
AC_PATH_PROGS(OPENJADE, openjade, openjade)
AC_SUBST(OPENJADE)
#
# Look for tex & pdftex.
@ -1418,66 +1418,100 @@ AC_SUBST(TEX)
AC_PATH_PROGS(PDFTEX, pdftex, pdftex)
AC_SUBST(PDFTEX)
AC_MSG_CHECKING(for SGML catalog)
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
f=$d/catalog
if test -f $f
then
SGMLCATALOG=$f
AC_MSG_RESULT($f)
break
fi
done
if test "X$SGMLCATALOG" = "X"
then
AC_MSG_RESULT("not found");
SGMLCATALOG=catalog
fi
AC_SUBST(SGMLCATALOG)
#
# Look for SGML files. The location varies; so far we
# have seen:
# Look for the HTML stylesheet html/docbook.dsl, used for
# formatting man pages in HTML. Its location varies,
# so far we have seen:
#
# NetBSD /usr/pkg/share/docbook/dsssl/modular/
# FreeBSD /usr/local/share/docbook/dsssl/modular/
# Linux /usr/local/share/dsssl/docbook/
#
SGMLDIR=""
SGMLSTYLEDIR=""
AC_MSG_CHECKING(for SGML files)
for d in /usr/pkg/share/sgml /usr/local/share/sgml
HTMLSTYLE=""
AC_MSG_CHECKING(for html/docbook.dsl)
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
for s in docbook/dsssl/modular dsssl/docbook
do
if test -f $d/$s/html/docbook.dsl
f=$d/$s/html/docbook.dsl
if test -f $f
then
SGMLDIR=$d
SGMLSTYLEDIR=$d/$s
AC_MSG_RESULT(in $SGMLSTYLEDIR)
HTMLSTYLE=$f
AC_MSG_RESULT($f)
break
fi
done
done
if test "X$SGMLDIR" = "X"
if test "X$HTMLSTYLE" = "X"
then
AC_MSG_RESULT("not found");
SGMLDIR=/usr/local/share/sgml
SGMLSTYLEDIR=/usr/local/share/docbook/dsssl/modular
HTMLSTYLE=docbook.dsl
fi
AC_SUBST(SGMLDIR)
AC_SUBST(SGMLSTYLEDIR)
AC_SUBST(HTMLSTYLE)
#
# Look for XML files.
# Look for XML declarations
#
XGMLDIR=""
AC_MSG_CHECKING(for XML files)
for d in /usr/pkg/share/xml /usr/local/share/xml
XMLDCL=""
AC_MSG_CHECKING(for xml.dcl)
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
if test -f $d/dtd/docbook/docbookx.dtd
f=$d/docbook/dsssl/modular/dtds/decls/xml.dcl
if test -f $f
then
XMLDIR=$d
AC_MSG_RESULT(in $XMLDIR)
XMLDCL=$f
AC_MSG_RESULT($f)
break
fi
done
if test "X$XMLDIR" = "X"
if test "X$XMLDCL" = "X"
then
AC_MSG_RESULT("not found");
XMLDIR=/usr/local/share/xml
XMLDCL=xml.dcl
fi
AC_SUBST(XMLDCL)
AC_SUBST(XMLDIR)
#
# Look for the docbook2X directory
#
AC_MSG_CHECKING(for docbook2X)
DOCBOOK2X=""
for d in /usr/pkg/share/sgml /usr/local/share/sgml
do
dd=$d/docbook2X
if test -f $dd/docbook2man-spec.pl
then
DOCBOOK2X=$dd
AC_MSG_RESULT($dd)
break
fi
done
if test "X$DOCBOOK2X" = "X"
then
AC_MSG_RESULT("not found");
DOCBOOK2X=.
fi
AC_SUBST(DOCBOOK2X)
#
# Substitutions
@ -1596,7 +1630,6 @@ AC_OUTPUT(
bin/dnssec/Makefile
doc/Makefile
doc/arm/Makefile
doc/arm/catalog
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh

View file

@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.4 2001/05/09 03:12:08 gson Exp $
# $Id: Makefile.in,v 1.5 2001/05/15 17:33:29 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@ -33,31 +33,28 @@ docclean manclean maintainer-clean::
rm -f *.html
Bv9ARM.html: Bv9ARM-book.xml
@JADE@ -v \
-c @SGMLDIR@/catalog \
${OPENJADE} -v \
-c ${SGMLCATALOG} \
-t sgml \
-d ./nominum-docbook-html.dsl \
@SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \
./Bv9ARM-book.xml
${XMLDCL} ./Bv9ARM-book.xml
Bv9ARM-book.dvi: Bv9ARM-book.pdf
@JADE@ -v \
${OPENJADE} -v \
-d ./nominum-docbook-print.dsl \
-t tex \
@SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \
./Bv9ARM-book.xml
${XMLDCL} ./Bv9ARM-book.xml
rm Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log
@TEX@ "&jadetex" ./Bv9ARM-book.tex
@TEX@ "&jadetex" ./Bv9ARM-book.tex
@TEX@ "&jadetex" ./Bv9ARM-book.tex
Bv9ARM-book.pdf: Bv9ARM-book.xml
@JADE@ -v \
${OPENJADE} -v \
-c @SGMLDIR@/catalog \
-d ./nominum-docbook-print.dsl \
-t tex \
@SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \
./Bv9ARM-book.xml
${XMLDCL} ./Bv9ARM-book.xml
rm Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log
@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex
@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex

View file

@ -1,6 +0,0 @@
CATALOG "@SGMLDIR@/iso8879/catalog"
CATALOG "@SGMLDIR@/docbook/2.4.1/catalog"
CATALOG "@SGMLDIR@/docbook/3.0/catalog"
CATALOG "@SGMLDIR@/docbook/3.1/catalog"
CATALOG "@SGMLDIR@/jade/catalog"
CATALOG "@XMLDIR@/catalog"

View file

@ -1,5 +1,5 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY dbstyle SYSTEM "@SGMLDIR@/docbook/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
<!ENTITY dbstyle SYSTEM "@HTMLSTYLE@" CDATA DSSSL>
]>
<style-sheet>

View file

@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: rules.in,v 1.33 2001/03/29 22:54:20 gson Exp $
# $Id: rules.in,v 1.34 2001/05/15 17:33:32 gson Exp $
###
### Common Makefile rules for BIND 9.
@ -179,10 +179,11 @@ INSTALL_DATA = @INSTALL_DATA@
.SUFFIXES: .docbook .html .1 .2 .3 .4 .5 .6 .7 .8
SHARESGML = @SGMLDIR@
OPENJADE = @JADE@
HTMLSTYLE = @SGMLSTYLEDIR@/html/docbook.dsl
DOCBOOK2X = ${SHARESGML}/docbook2X
OPENJADE = @OPENJADE@
SGMLCATALOG = @SGMLCATALOG@
HTMLSTYLE = @HTMLSTYLE@
XMLDCL = @XMLDCL@
DOCBOOK2X = @DOCBOOK2X@
ONSGMLS = onsgmls
SGMLSPL = sgmlspl
@ -193,61 +194,61 @@ SGMLSPL = sgmlspl
# be changed.
#
.docbook.html:
${OPENJADE} -t sgml -d ${HTMLSTYLE} $<
${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $<
cat ${top_srcdir}/util/HTML_COPYRIGHT r1.htm > $@
rm -f r1.htm
.docbook.1:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.2:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.3:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.4:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.5:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.6:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.7:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
.docbook.8:
${ONSGMLS} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2X}/docbook2man-spec.pl
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@