Commit 6c68e68f authored by Andreas Gustafsson's avatar Andreas Gustafsson

When generating man pages from docbook source, add CVS Id lines

so that they don't keep appearing and disappearing depending
on whether "make man" or "update_copyright" was run last.
Also, moved HTML_COPYRIGHT and MAN_COPYRIGHT to a new
directory "docutil" which is actually shipped with the
distribution, unlike the "util" directory.
parent a6f360bb
......@@ -9341,6 +9341,7 @@ trap 'rm -fr `echo "make/rules
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh
docutil/docbook2man-wrapper.sh
isc-config.sh
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
......@@ -9612,6 +9613,7 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh
docutil/docbook2man-wrapper.sh
isc-config.sh
"}
EOF
......
......@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.260 $)
AC_REVISION($Revision: 1.261 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
......@@ -1628,6 +1628,7 @@ AC_OUTPUT(
doc/arm/nominum-docbook-html.dsl
doc/arm/nominum-docbook-print.dsl
doc/arm/validate.sh
docutil/docbook2man-wrapper.sh
isc-config.sh
)
chmod a+x isc-config.sh
......
docbook2man-wrapper.sh
......@@ -14,3 +14,6 @@
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
<!-- @Id@ -->
......@@ -12,3 +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@
.\"
#!/bin/sh
#
# Copyright (C) 2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
# 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: docbook2man-wrapper.sh.in,v 1.1 2001/06/08 19:04:05 gson Exp $
case $# in
3) ;;
*) echo "$0: wrong number of arguments" >&2; exit 1 ;;
esac
top_srcdir=$1
source=$2
target=$3
ONSGMLS=onsgmls
SGMLSPL=sgmlspl
SGMLCATALOG=@SGMLCATALOG@
DOCBOOK2MANSPEC=@DOCBOOK2MANSPEC@
${ONSGMLS} -c ${SGMLCATALOG} $source | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $target.tmp
grep -v 'auto-generated by docbook2man' $target > $target.tmp
rm -f $target
sed 's/@Id@/$Id: docbook2man-wrapper.sh.in,v 1.1 2001/06/08 19:04:05 gson Exp $/' < ${top_srcdir}/docutil/MAN_COPYRIGHT > $target
cat $target.tmp >> $target
rm -f manpage.* $target.tmp
......@@ -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.36 2001/05/15 20:09:47 gson Exp $
# $Id: rules.in,v 1.37 2001/06/08 19:04:05 gson Exp $
###
### Common Makefile rules for BIND 9.
......@@ -198,62 +198,23 @@ SGMLSPL = sgmlspl
#
.docbook.html:
${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $<
cat ${top_srcdir}/util/HTML_COPYRIGHT r1.htm > $@
sed 's/@Id@/$$Id: rules.in,v 1.37 2001/06/08 19:04:05 gson Exp $$/' < ${top_srcdir}/docutil/HTML_COPYRIGHT > $@
cat r1.htm >> $@
rm -f r1.htm
.docbook.1:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.2:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.3:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.4:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.5:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.6:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.7:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
.docbook.8:
${ONSGMLS} -c ${SGMLCATALOG} $< | ${SGMLSPL} ${DOCBOOK2MANSPEC}
rm -f $@.tmp
grep -v 'auto-generated by docbook2man' $@ > $@.tmp
rm -f $@
cat ${top_srcdir}/util/MAN_COPYRIGHT $@.tmp > $@
rm -f manpage.* $@.tmp
sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
<!--
- Copyright (C) 2000, 2001 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- 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.
-->
.\" Copyright (C) 2000, 2001 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
.\" copyright notice and this permission notice appear in all copies.
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
.\" DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
.\" INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
.\" 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.
......@@ -944,6 +944,10 @@
./doc/todo/mws/todo X 2000,2001
./doc/todo/tale/todo X 2000,2001
./doc/todo/unassigned X 2000,2001
./docutil/.cvsignore X 2001
./docutil/HTML_COPYRIGHT X 2001
./docutil/MAN_COPYRIGHT X 2001
./docutil/docbook2man-wrapper.sh.in SH 2001
./install-sh X 1999,2000,2001
./isc-config.sh.in SH 2000,2001
./lib/.cvsignore X 1999,2000,2001
......@@ -1819,8 +1823,6 @@
./util/COPYRIGHT.NAI X 1996,1997,1998,1999,2000,2001
./util/COPYRIGHT.NOM X 2001
./util/COPYRIGHT.PORTION X 1996,1997,1998,1999,2000,2001
./util/HTML_COPYRIGHT X 2001
./util/MAN_COPYRIGHT X 2001
./util/altbuild.sh SH 2000,2001
./util/check-includes.pl PERL 2000,2001
./util/check-instincludes.sh SH 2000,2001
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment