Update to version 1.10.

Changes since last packaged version:

Version 1.10
   * Added scanner for log files (also for iptables and apache logs)
     thanks to Jan Tatarik
   * Fixed some bugs in the perl scanner (thanks to Geir Nilsen)
   * configure checks for ios_base
   * check for the right ar to use, fixes problems under Sun compilers
     (thanks to Paul Townsend)

7 files changed, 126 insertions, 120 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index f16ad65e48a..92f012e06ad 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/05/16 12:22:40 seb Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/16 15:21:45 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.9
+DISTNAME=	source-highlight-1.10
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index d5c5bd5a4fe..92a9ecbddad 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/05/15 14:55:38 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/08/16 15:21:45 seb Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
@@ -18,16 +18,22 @@ share/doc/html/source-highlight/Hello_h_f.html
 share/doc/html/source-highlight/Hello_lines.html
 share/doc/html/source-highlight/Hello_xhtml.html
 share/doc/html/source-highlight/Hello_xhtml2.html
+share/doc/html/source-highlight/access.log.html
+share/doc/html/source-highlight/auth.log.html
 share/doc/html/source-highlight/cmdline.c.html
 share/doc/html/source-highlight/cmdline.h.html
 share/doc/html/source-highlight/colors.html
 share/doc/html/source-highlight/cpp2html.css
+share/doc/html/source-highlight/error.log.html
 share/doc/html/source-highlight/flex_scanner.ll.html
 share/doc/html/source-highlight/mono-alt.css
 share/doc/html/source-highlight/mono.css
 share/doc/html/source-highlight/source-highlight.html
 share/doc/html/source-highlight/startapp.cc.html
+share/doc/html/source-highlight/syslog.log.html
+share/doc/html/source-highlight/tags.syslog
 share/doc/html/source-highlight/test.js.html
+share/doc/html/source-highlight/test.log.html
 share/doc/html/source-highlight/test.lua.html
 share/doc/html/source-highlight/test.ml.html
 share/doc/html/source-highlight/test.php3.html
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 0f642fd5565..0cb44796d7f 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/05/16 12:22:40 seb Exp $
+$NetBSD: distinfo,v 1.9 2004/08/16 15:21:45 seb Exp $
 
-SHA1 (source-highlight-1.9.tar.gz) = b7acc3e354a3043c517f7efa4ddb5e0924464a68
-Size (source-highlight-1.9.tar.gz) = 682343 bytes
+SHA1 (source-highlight-1.10.tar.gz) = 2ae61f792d48262339b2a07d4d39af978d78b0a1
+Size (source-highlight-1.10.tar.gz) = 721159 bytes
 SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
-SHA1 (patch-ab) = ecb8ce16381bd68b55f309a0ae43912319138575
+SHA1 (patch-ab) = 8b8d92e8bfe8773b7eeff6d7d794f4b8f47218ac
 SHA1 (patch-ac) = 62475d945664b84eb4a6e43e5cd4c75f9049eefe
-SHA1 (patch-ad) = 7be6c33e8dbcc61f09ede32b25f6c912bb41b4de
+SHA1 (patch-ad) = e9635748cedbc11d7a0c7a68f149e8647a3ddbc0
 SHA1 (patch-ae) = ea3b682e89556a8c32b990585c07c6cd48fb24d9
-SHA1 (patch-ag) = 77d3668ad1573fee7423aa3651c77ae64fd7cbb7
-SHA1 (patch-ah) = a0df2fb54d9093834d2a017efc3ff512bbd517bf
+SHA1 (patch-ag) = 8276d263a44fb4e06547d399c32d9e5c76ea4b7f
+SHA1 (patch-ah) = 3557d9ab161b803150267ae7c3976477836b04c7
diff --git a/textproc/source-highlight/patches/patch-ab b/textproc/source-highlight/patches/patch-ab
index c434d4236af..e0d0a67bbf7 100644
--- a/textproc/source-highlight/patches/patch-ab
+++ b/textproc/source-highlight/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-ab,v 1.2 2004/08/16 15:21:45 seb Exp $
 
---- configure.orig	Wed Oct 30 18:21:38 2002
+--- configure.orig	2004-08-16 14:10:31.000000000 +0000
 +++ configure
-@@ -1595,8 +1595,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir source_highlightdocdir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir source_highlightdocdir source_highlightdochtmldir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -1744,8 +1744,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
  
  
  
@@ -13,8 +22,8 @@ $NetBSD: patch-ab,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  
  
-@@ -5963,6 +5965,7 @@ s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
+@@ -7341,6 +7343,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@am__leading_dot@,$am__leading_dot,;t t
  s,@source_highlightdatadir@,$source_highlightdatadir,;t t
  s,@source_highlightdocdir@,$source_highlightdocdir,;t t
 +s,@source_highlightdochtmldir@,$source_highlightdochtmldir,;t t
diff --git a/textproc/source-highlight/patches/patch-ad b/textproc/source-highlight/patches/patch-ad
index 7ab9501a8a0..70d3b56d5dd 100644
--- a/textproc/source-highlight/patches/patch-ad
+++ b/textproc/source-highlight/patches/patch-ad
@@ -1,67 +1,56 @@
-$NetBSD: patch-ad,v 1.3 2003/06/12 01:17:32 seb Exp $
+$NetBSD: patch-ad,v 1.4 2004/08/16 15:21:45 seb Exp $
 
---- doc/Makefile.in.orig	2003-06-12 00:36:17.000000000 +0000
+--- doc/Makefile.in.orig	2004-08-16 14:10:12.000000000 +0000
 +++ doc/Makefile.in
-@@ -138,6 +138,7 @@ sbindir = @sbindir@
+@@ -59,11 +59,11 @@ CONFIG_CLEAN_FILES = source-highlight.ht
+ SOURCES =
+ DIST_SOURCES =
+ man1dir = $(mandir)/man1
+-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"
++am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"
+ NROFF = nroff
+ MANS = $(man_MANS)
+-source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(source_highlightdoc_DATA)
++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(source_highlightdochtml_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -161,6 +161,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  source_highlightdatadir = @source_highlightdatadir@
  source_highlightdocdir = @source_highlightdocdir@
 +source_highlightdochtmldir = @source_highlightdochtmldir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
-@@ -168,7 +169,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
+ TAGS_J2H_OPTION = --tags-file $(top_srcdir)/src/tags.j2h 
+@@ -182,7 +183,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
+              header.html footer.html \
               startapp.cc.html cmdline.c.html cmdline.h.html
  
- 
 -source_highlightdoc_DATA = colors.html @PACKAGE@.html \
 +source_highlightdochtml_DATA = colors.html @PACKAGE@.html \
      Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
      Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
      Hello_xhtml2.html \
-@@ -202,11 +203,13 @@ subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = source-highlight.html source-highlight.1
-+depcomp =
-+am__depfiles_maybe =
- DIST_SOURCES =
- 
- NROFF = nroff
- MANS = $(man_MANS)
--DATA = $(source_highlightdoc_DATA)
-+DATA = $(source_highlightdochtml_DATA)
- 
- DIST_COMMON = Makefile.am Makefile.in source-highlight.1.in \
- 	source-highlight.html.in
-@@ -215,7 +218,7 @@ all: all-am
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps doc/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- source-highlight.html: $(top_builddir)/config.status source-highlight.html.in
-@@ -270,23 +273,23 @@ uninstall-man1:
- 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
- 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+@@ -291,22 +292,22 @@ uninstall-man1:
+ 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
  	done
--source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
 -install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
 +install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
  	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
+-	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
 -	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	$(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir)
++	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
 +	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \
--	  $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \
-+	  echo " $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
-+	  $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f; \
+-	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
  	done
  
 -uninstall-source_highlightdocDATA:
@@ -70,23 +59,23 @@ $NetBSD: patch-ad,v 1.3 2003/06/12 01:17:32 seb Exp $
 -	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
 +	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(source_highlightdocdir)/$$f"; \
--	  rm -f $(DESTDIR)$(source_highlightdocdir)/$$f; \
-+	  echo " rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
-+	  rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f; \
+-	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
  	done
  tags: TAGS
  TAGS:
-@@ -331,7 +334,7 @@ check: check-am
+@@ -346,7 +347,7 @@ check-am: all-am
+ check: check-am
  all-am: Makefile $(MANS) $(DATA)
- 
  installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(source_highlightdocdir)
-+	$(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(source_highlightdochtmldir)
- 
+-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"; do \
++	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
  install: install-am
- install-exec: install-exec-am
-@@ -374,7 +377,7 @@ info: info-am
+@@ -392,7 +393,7 @@ info: info-am
  
  info-am:
  
@@ -95,7 +84,7 @@ $NetBSD: patch-ad,v 1.3 2003/06/12 01:17:32 seb Exp $
  
  install-exec-am:
  
-@@ -401,7 +404,7 @@ ps: ps-am
+@@ -419,7 +420,7 @@ ps: ps-am
  ps-am:
  
  uninstall-am: uninstall-info-am uninstall-man \
@@ -104,9 +93,9 @@ $NetBSD: patch-ad,v 1.3 2003/06/12 01:17:32 seb Exp $
  
  uninstall-man: uninstall-man1
  
-@@ -409,11 +412,12 @@ uninstall-man: uninstall-man1
- 	distclean-generic distdir dvi dvi-am info info-am install \
- 	install-am install-data install-data-am install-exec \
+@@ -427,11 +428,12 @@ uninstall-man: uninstall-man1
+ 	distclean-generic distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
 -	install-man1 install-source_highlightdocDATA install-strip \
 +	install-man1 install-source_highlightdochtmlDATA install-strip \
diff --git a/textproc/source-highlight/patches/patch-ag b/textproc/source-highlight/patches/patch-ag
index 858b42f23b9..2c5be483c50 100644
--- a/textproc/source-highlight/patches/patch-ag
+++ b/textproc/source-highlight/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.4 2004/05/15 14:55:38 seb Exp $
+$NetBSD: patch-ag,v 1.5 2004/08/16 15:21:45 seb Exp $
 
---- tests/Makefile.am.orig	2004-03-08 19:13:31.000000000 +0000
+--- tests/Makefile.am.orig	2004-07-11 12:58:38.000000000 +0000
 +++ tests/Makefile.am
-@@ -255,7 +255,7 @@ check_sml: test.sml.html
- 	@echo expect no output from diff
- 	diff $(srcdir)/test.sml.html test.sml.out.html
+@@ -279,7 +279,7 @@ check_log: test.log.html
+ 	diff $(srcdir)/error.log.html error.log.out.html
+ 	diff $(srcdir)/syslog.log.html syslog.log.out.html
  
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
  test.py.html test.rb.html test.js.html test.lua.html test.ml.html \
- test.sml.html
- 
+ test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html \
+ tags.syslog
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index 764ceb6dee0..b32dc8ac1ac 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,52 +1,54 @@
-$NetBSD: patch-ah,v 1.5 2004/05/15 14:55:38 seb Exp $
+$NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
 
---- tests/Makefile.in.orig	2004-04-19 11:19:02.000000000 +0000
+--- tests/Makefile.in.orig	2004-08-16 14:10:24.000000000 +0000
 +++ tests/Makefile.in
-@@ -138,6 +138,7 @@ sbindir = @sbindir@
+@@ -56,9 +56,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__installdirs = "$(DESTDIR)$(source_highlightdocdir)"
+-source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(source_highlightdoc_DATA)
++am__installdirs = "$(DESTDIR)$(source_highlightdochtmldir)"
++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(source_highlightdochtml_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -156,6 +156,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  source_highlightdatadir = @source_highlightdatadir@
  source_highlightdocdir = @source_highlightdocdir@
 +source_highlightdochtmldir = @source_highlightdochtmldir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
-@@ -209,7 +210,7 @@ test.sml test.sml.html
+ TAGS_J2H_OPTION = -f html --tags-file $(top_srcdir)/src/tags.j2h 
+@@ -214,7 +215,7 @@ syslog.log syslog.log.html \
+ tags.syslog
  
  CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
- 
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
  test.py.html test.rb.html test.js.html test.lua.html test.ml.html \
- test.sml.html
- 
-@@ -220,7 +221,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
--DATA = $(source_highlightdoc_DATA)
-+DATA = $(source_highlightdochtml_DATA)
- 
- DIST_COMMON = Makefile.am Makefile.in
- all: all-am
-@@ -232,23 +233,23 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html \
+ tags.syslog
+@@ -253,22 +254,22 @@ $(top_srcdir)/configure:  $(am__configur
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  uninstall-info-am:
--source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
 -install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
 +install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
  	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
+-	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
 -	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	$(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir)
++	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
 +	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \
--	  $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \
-+	  echo " $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
-+	  $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f; \
+-	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
  	done
  
 -uninstall-source_highlightdocDATA:
@@ -55,23 +57,23 @@ $NetBSD: patch-ah,v 1.5 2004/05/15 14:55:38 seb Exp $
 -	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
 +	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(source_highlightdocdir)/$$f"; \
--	  rm -f $(DESTDIR)$(source_highlightdocdir)/$$f; \
-+	  echo " rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
-+	  rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f; \
+-	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
  	done
  tags: TAGS
  TAGS:
-@@ -293,7 +294,7 @@ check: check-am
+@@ -308,7 +309,7 @@ check-am: all-am
+ check: check-am
  all-am: Makefile $(DATA)
- 
  installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
-+	$(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir)
- 
+-	for dir in "$(DESTDIR)$(source_highlightdocdir)"; do \
++	for dir in "$(DESTDIR)$(source_highlightdochtmldir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
  install: install-am
- install-exec: install-exec-am
-@@ -336,7 +337,7 @@ info: info-am
+@@ -354,7 +355,7 @@ info: info-am
  
  info-am:
  
@@ -80,7 +82,7 @@ $NetBSD: patch-ah,v 1.5 2004/05/15 14:55:38 seb Exp $
  
  install-exec-am:
  
-@@ -362,17 +363,17 @@ ps: ps-am
+@@ -380,17 +381,17 @@ ps: ps-am
  
  ps-am:
  
@@ -88,8 +90,8 @@ $NetBSD: patch-ah,v 1.5 2004/05/15 14:55:38 seb Exp $
 +uninstall-am: uninstall-info-am uninstall-source_highlightdochtmlDATA
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
- 	distclean-generic distdir dvi dvi-am info info-am install \
- 	install-am install-data install-data-am install-exec \
+ 	distclean-generic distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
 -	install-source_highlightdocDATA install-strip installcheck \
 +	install-source_highlightdochtmlDATA install-strip installcheck \