summaryrefslogtreecommitdiff
path: root/textproc/source-highlight/patches/patch-ah
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/source-highlight/patches/patch-ah')
-rw-r--r--textproc/source-highlight/patches/patch-ah86
1 files changed, 44 insertions, 42 deletions
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 \