From: Theodore Ts'o Date: Sat, 28 Dec 2013 20:40:56 +0000 (-0500) Subject: Use makeinfo --html instead of texi2html X-Git-Tag: v1.42.9~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b79e338d2ca2d148164deff2129d33eac665ac6c;p=thirdparty%2Fe2fsprogs.git Use makeinfo --html instead of texi2html The texi2html utility from the texi2html ceased being developed upstream in 2011, and upstream has declared it superseded by the makeinfo utility from the texinfo package. Signed-off-by: "Theodore Ts'o" --- diff --git a/debian/comerr-dev.doc-base b/debian/comerr-dev.doc-base index ccde9543e..463eb7673 100644 --- a/debian/comerr-dev.doc-base +++ b/debian/comerr-dev.doc-base @@ -8,5 +8,5 @@ Abstract: A library, and associated utilities, Section: Programming Format: HTML -Index: /usr/share/doc/comerr-dev/html-info/com_err_toc.html +Index: /usr/share/doc/comerr-dev/html-info/com_err.html Files: /usr/share/doc/comerr-dev/html-info/*.html diff --git a/debian/control.in b/debian/control.in index 0083b9db2..81f10aef6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o -Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4 +Build-Depends: gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4 Standards-Version: 3.9.4 Homepage: http://e2fsprogs.sourceforge.net diff --git a/debian/e2fslibs-dev.doc-base b/debian/e2fslibs-dev.doc-base index d1023155b..19d04f429 100644 --- a/debian/e2fslibs-dev.doc-base +++ b/debian/e2fslibs-dev.doc-base @@ -6,5 +6,5 @@ Abstract: The EXT2FS library is designed to allow Section: Programming Format: HTML -Index: /usr/share/doc/e2fslibs/html-info/libext2fs_toc.html +Index: /usr/share/doc/e2fslibs/html-info/libext2fs.html Files: /usr/share/doc/e2fslibs/html-info/*.html diff --git a/debian/rules b/debian/rules index b1d511ff4..de7d614f4 100755 --- a/debian/rules +++ b/debian/rules @@ -333,8 +333,8 @@ ifneq ($(BUILD_E2FSCK_STATIC),no) endif $(MAKE) -C ${stdbuilddir}/po V=1 update-gmo - ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs_abt.html ) - ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err_abt.html ) + ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs.html ) + ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err.html ) # specially-built MIPS libs ifneq ($(ismips),) diff --git a/doc/Makefile.in b/doc/Makefile.in index d7cb6c352..a2b261236 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -14,10 +14,10 @@ INSTALL = @INSTALL@ DVI=texi2dvi DVIPS=dvips -o "$@" INFO=@MAKEINFO@ -HTML=texi2html -split_chapter +HTML=makeinfo --html --no-split PS2PDF=ps2pdf -all:: libext2fs.info libext2fs.dvi +all:: libext2fs.info libext2fs.dvi libext2fs.html install-doc-libs: libext2fs.info libext2fs.dvi $(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* @@ -49,12 +49,9 @@ libext2fs.pdf: libext2fs.ps $(E) " PS2PDF $@" -$(Q) $(PS2PDF) libext2fs.ps -libext2fs_abt.html: $(srcdir)/libext2fs.texinfo +libext2fs.html: $(srcdir)/libext2fs.texinfo $(E) " TEXI2HTML $@" -$(Q) $(HTML) $(srcdir)/libext2fs.texinfo - -$(Q) if test -d libext2fs ; then \ - mv libext2fs/* . ; rmdir libext2fs ; \ - fi .PHONY: distclean distclean:: clean diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo index 768b1ded5..87ed2e105 100644 --- a/doc/libext2fs.texinfo +++ b/doc/libext2fs.texinfo @@ -97,7 +97,6 @@ by the Foundation. @end titlepage @headings double -@ifinfo @node Top, Introduction to the EXT2FS Library, (dir), (dir) @top The EXT2FS Library @@ -111,8 +110,6 @@ This manual documents the EXT2FS Library, version 1.42.8. * Function Index:: @end menu -@end ifinfo - @c ---------------------------------------------------------------------- @node Introduction to the EXT2FS Library, EXT2FS Library Functions, Top, Top diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index fd4e6e28d..ff99f5d0a 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -63,7 +63,7 @@ compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in DVI=texi2dvi DVIPS=dvips -o "$@" INFO=@MAKEINFO@ -HTML=texi2html -split_chapter +HTML=makeinfo --html --no-split PS2PDF=ps2pdf com_err.ps : com_err.dvi @@ -85,12 +85,9 @@ com_err.pdf: com_err.ps $(E) " PS2PDF $@" -$(Q) $(PS2PDF) com_err.ps -com_err_abt.html: $(srcdir)/com_err.texinfo - $(E) " TEXI2HTML $@" +com_err.html: $(srcdir)/com_err.texinfo + $(E) " MAKEINFO $@" -$(Q) $(HTML) $(srcdir)/com_err.texinfo - -$(Q) if test -d com_err ; then \ - mv com_err/* . ; rmdir com_err ; \ - fi com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status $(E) " CONFIG.STATUS $@" diff --git a/lib/et/com_err.texinfo b/lib/et/com_err.texinfo index 748c7e23f..c9d3fcafb 100644 --- a/lib/et/com_err.texinfo +++ b/lib/et/com_err.texinfo @@ -111,7 +111,6 @@ from the remainder of this package. @end titlepage -@ifinfo @node Top, Why com_err?, (dir), (dir) @top A Common Error Description Library for UNIX @@ -131,7 +130,6 @@ This manual documents the com_err library. @end menu @page -@end ifinfo @node Why com_err?, Error codes, Top, Top @chapter Why com_err?