Patchwork [1/2] texinfo: correct dont-depend-on-help2man.patch

login
register
mail settings
Submitter Marko Lindqvist
Date Aug. 20, 2013, 7:56 p.m.
Message ID <ecbb9d4e38ed43399b6155e2b7a71252dbb57a01.1376988152.git.cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/56077/
State Accepted
Commit 58eb62b3df8b8780af5833022e62512534676e3e
Headers show

Comments

Marko Lindqvist - Aug. 20, 2013, 7:56 p.m.
Patch needed only with automake-1.13 no longer worked as expected
after texinfo has been updated to version 5.1.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../texinfo-5.1/dont-depend-on-help2man.patch      |   43 +++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch
index 7502328..6e216da 100644
--- a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch
@@ -1,11 +1,10 @@ 
 Upstream-Status: Inapprop?iate
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-Index: texinfo-5.1/doc/Makefile.am
-===================================================================
---- texinfo-5.1.orig/doc/Makefile.am
-+++ texinfo-5.1/doc/Makefile.am
-@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard
+diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
+--- texinfo-5.1/doc/Makefile.am	2013-02-23 02:11:25.000000000 +0200
++++ texinfo-5.1/doc/Makefile.am	2013-08-20 01:43:55.622376198 +0300
+@@ -40,7 +40,7 @@
  # Include our texinfo.tex, not Automake's.
  EXTRA_DIST = epsf.tex texinfo.tex \
               fdl.texi \
@@ -14,3 +13,37 @@  Index: texinfo-5.1/doc/Makefile.am
  	     $(refcard_files)
  
  if INSTALL_WARNINGS
+diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am
+--- texinfo-5.1/man/Makefile.am	2013-02-23 02:11:25.000000000 +0200
++++ texinfo-5.1/man/Makefile.am	2013-08-20 01:53:40.542395884 +0300
+@@ -13,24 +13,24 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ # These are generated using help2man.
+-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
++#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+
+ # These require the build in info/, thus can't do if we failed to find a
+ # terminal library.
+ if HAVE_TERMLIBS
+-man_MANS += info.1 infokey.1
++#man_MANS += info.1 infokey.1
+ endif
+
+ # These are hand-written.
+-man_MANS += info.5 texinfo.5
++#man_MANS += info.5 texinfo.5
+
+ # This is generated by pod2man, but let's just run it by hand.
+-man_MANS += pod2texi.1
++#man_MANS += pod2texi.1
+
+ # These are just .so's to the common program.
+-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
++#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
+
+-EXTRA_DIST = $(man_MANS) ginfo.h2m
++EXTRA_DIST = ginfo.h2m
+
+ # Maintainers should be able to regenerate.
+ MAINTAINERCLEANFILES = $(man_MANS)