diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
| commit | 1173d5eff8dc423c129f442023419436ee94db23 (patch) | |
| tree | 57c2bcdc1429b2e80b91a387cd1dc561dab988eb /usr.sbin/bind/Makefile.in | |
| parent | e4a92ccc5f8c866478b32a346c71150a2cdf5001 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/Makefile.in')
| -rw-r--r-- | usr.sbin/bind/Makefile.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/usr.sbin/bind/Makefile.in b/usr.sbin/bind/Makefile.in index 4db9158ae95..33c68506296 100644 --- a/usr.sbin/bind/Makefile.in +++ b/usr.sbin/bind/Makefile.in @@ -1,7 +1,7 @@ -# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2002 Internet Software Consortium. # -# Permission to use, copy, modify, and distribute this software for any +# Permission to use, copy, modify, and/or 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. # @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $ISC: Makefile.in,v 1.41.2.2.2.4 2006/05/19 00:04:00 marka Exp $ +# $ISC: Makefile.in,v 1.43.18.6 2007/09/03 23:46:21 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -53,3 +53,11 @@ install:: isc-config.sh installdirs tags: rm -f TAGS find lib bin -name "*.[ch]" -print | @ETAGS@ - + +FAQ: FAQ.xml + ${XSLTPROC} doc/xsl/isc-docbook-text.xsl FAQ.xml | \ + LC_ALL=C ${W3M} -T text/html -dump -cols 72 >$@.tmp + mv $@.tmp $@ + +clean:: + rm -f FAQ.tmp |