More texinfo path fixes, from PR 18634 by Lubomir Sedlacik.

2 files changed, 10 insertions, 24 deletions

diff --git a/devel/automake14/distinfo b/devel/automake14/distinfo
index 4a9baa0ecf4..db79518a40b 100644
--- a/devel/automake14/distinfo
+++ b/devel/automake14/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/10/26 18:04:06 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2002/10/27 20:47:54 bouyer Exp $
 
 SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438
 Size (automake-1.4-p6.tar.gz) = 375060 bytes
 SHA1 (patch-aa) = e5e7f073a777be92f419173c9cc84dc42325a3a1
-SHA1 (patch-ab) = 9cdccb652f5d899f10941ad43eb7c53d4581a5e3
+SHA1 (patch-ab) = 1cd201197633853626ddc46c7ba9722c5eaf7b0e
diff --git a/devel/automake14/patches/patch-ab b/devel/automake14/patches/patch-ab
index ac167b563b5..d783d70998a 100644
--- a/devel/automake14/patches/patch-ab
+++ b/devel/automake14/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/10/26 18:04:06 bouyer Exp $
+$NetBSD: patch-ab,v 1.3 2002/10/27 20:47:55 bouyer Exp $
 
 --- Makefile.in.orig	Sat Jul 27 23:09:40 2002
 +++ Makefile.in
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/26 18:04:06 bouyer Exp $
  	  else :; fi; fi; \
  	done
  
-@@ -183,7 +183,7 @@ DVIPS = dvips
+@@ -183,7 +183,7 @@
  .texi.info:
  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
  	cd $(srcdir) \
@@ -27,13 +27,13 @@ $NetBSD: patch-ab,v 1.2 2002/10/26 18:04:06 bouyer Exp $
  
  .texi.dvi:
  	TEXINPUTS=.:$$TEXINPUTS \
-@@ -227,34 +227,26 @@ DVIPS = dvips
+@@ -227,23 +227,15 @@
  install-info-am: $(INFO_DEPS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(infodir)
 -	@list='$(INFO_DEPS)'; \
 -	for file in $$list; do \
--	  d=$(srcdir); \
+ 	  d=$(srcdir); \
 -	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 -	    if test -f $$d/$$ifile; then \
 -	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
@@ -41,7 +41,6 @@ $NetBSD: patch-ab,v 1.2 2002/10/26 18:04:06 bouyer Exp $
 -	    else : ; fi; \
 -	  done; \
 -	done
-+	d=$(srcdir); \
 +	if test -f $$d/automake.info; then \
 +	   echo " $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info"; \
 +	   $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info; \
@@ -53,26 +52,13 @@ $NetBSD: patch-ab,v 1.2 2002/10/26 18:04:06 bouyer Exp $
 -	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
 -	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
 -	  done; \
-+	@if $(SHELL) -c '/usr/bin/install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	    echo " /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info";\
-+	    /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info || :;\
++	@if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++	    echo " $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info";\
++	    $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info || :;\
  	else : ; fi
  
  uninstall-info:
- 	$(PRE_UNINSTALL)
--	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	@if $(SHELL) -c '/usr/bin/install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- 	  ii=yes; \
- 	else ii=; fi; \
- 	list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
- 	  test -z "$$ii" \
--	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-+	    || /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
- 	done
- 	@$(NORMAL_UNINSTALL)
- 	list='$(INFO_DEPS)'; \
-@@ -488,7 +480,6 @@ installcheck-am: installcheck-local
+@@ -488,7 +480,6 @@
  installcheck: installcheck-recursive
  install-exec-am: install-binSCRIPTS
  	@$(NORMAL_INSTALL)