mirror of https://github.com/vitalif/e2fsprogs
debian: Fix FTBFS problem caused by texi2html changing its output location
Unfortunately, texi2html gratuitously changed its behavior of where its output html files are placed when the -split_chapter is in effect. (First it was in a subdirectory; then it was in the current directory; now it's back to putting the output html files in a subdirectory again.) Support either way of doing things since the texi2html team seems to be indecisive... Addresses-Debian-Bug: #552934 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>bitmap-optimize
parent
785f939046
commit
4534f8bc3f
|
@ -8,5 +8,5 @@ Abstract: A library, and associated utilities,
|
|||
Section: Programming
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/comerr-dev/html-info/com_err.html
|
||||
Index: /usr/share/doc/comerr-dev/html-info/com_err_toc.html
|
||||
Files: /usr/share/doc/comerr-dev/html-info/*.html
|
||||
|
|
|
@ -250,10 +250,8 @@ ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
|
|||
$(MAKE) -C ${stdbuilddir} all
|
||||
$(MAKE) -C ${stdbuilddir}/e2fsck e2fsck.static
|
||||
|
||||
( cd ${stdbuilddir}/doc && \
|
||||
texi2html -split_chapter ${topdir}/doc/libext2fs.texinfo )
|
||||
( cd ${stdbuilddir}/lib/et && $(MAKE) com_err.info && \
|
||||
texi2html -split_chapter -expandinfo ${topdir}/lib/et/com_err.texinfo )
|
||||
( cd ${stdbuilddir}/doc && $(MAKE) libext2fs_abt.html )
|
||||
( cd ${stdbuilddir}/lib/et && $(MAKE) com_err.info com_err_abt.html )
|
||||
|
||||
# specially-built MIPS libs
|
||||
ifneq ($(ismips),)
|
||||
|
@ -291,7 +289,7 @@ clean:
|
|||
[ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} distclean
|
||||
[ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} distclean
|
||||
rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} ${mipsbuilddir} ${mipsbuilddir64}
|
||||
rm -f doc/libext2fs/*.html lib/et/com_err/*.html debian/*.substvars
|
||||
rm -f debian/*.substvars
|
||||
dh_clean
|
||||
|
||||
install: cleanup install-std
|
||||
|
@ -424,10 +422,10 @@ endif
|
|||
|
||||
# HTML docs
|
||||
$(INSTALL) -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
|
||||
$(INSTALL) -p -m 0644 ${stdbuilddir}/doc/libext2fs/*.html \
|
||||
$(INSTALL) -p -m 0644 ${stdbuilddir}/doc/*.html \
|
||||
${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
|
||||
$(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
|
||||
$(INSTALL) -p -m 0644 ${stdbuilddir}/lib/et/com_err/*.html \
|
||||
$(INSTALL) -p -m 0644 ${stdbuilddir}/lib/et/*.html \
|
||||
${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
|
||||
|
||||
# texinfo docs
|
||||
|
|
|
@ -14,7 +14,7 @@ INSTALL = @INSTALL@
|
|||
DVI=texi2dvi
|
||||
DVIPS=dvips -o "$@"
|
||||
INFO=@MAKEINFO@
|
||||
HTML=texi2html
|
||||
HTML=texi2html -split_chapter
|
||||
|
||||
all:: libext2fs.info libext2fs.dvi
|
||||
|
||||
|
@ -40,6 +40,13 @@ libext2fs.dvi: $(srcdir)/libext2fs.texinfo
|
|||
$(E) " TEXI2DVI $@"
|
||||
-$(Q) $(DVI) $(srcdir)/libext2fs.texinfo
|
||||
|
||||
libext2fs_abt.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
|
||||
$(RM) -f Makefile
|
||||
|
@ -48,7 +55,7 @@ distclean:: clean
|
|||
clean:: clean-all
|
||||
|
||||
.PHONY: clean-all
|
||||
clean-all:: clean-tex clean-backup clean-final clean-tarfiles
|
||||
clean-all:: clean-tex clean-backup clean-final clean-tarfiles clean-html
|
||||
|
||||
.PHONY: clean-final
|
||||
clean-final::
|
||||
|
@ -65,3 +72,7 @@ clean-backup::
|
|||
.PHONY: clean-tarfiles
|
||||
clean-tarfiles::
|
||||
$(RM) -f *.tar *.tar.gz *.tgz
|
||||
|
||||
clean-html::
|
||||
$(RM) -f *.html
|
||||
|
||||
|
|
|
@ -62,6 +62,13 @@ compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
|
|||
com_err.ps : com_err.dvi
|
||||
com_err.dvi: com_err.texinfo
|
||||
|
||||
com_err_abt.html: $(srcdir)/com_err.texinfo
|
||||
$(E) " TEXI2HTML $@"
|
||||
-$(Q) texi2html -split_chapter $(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 $@"
|
||||
$(Q) cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
|
||||
|
@ -124,7 +131,7 @@ check:: compile_et
|
|||
clean::
|
||||
$(RM) -f compile_et libcom_err.a libcom_err_p.a com_err.info
|
||||
$(RM) -f $(OBJS) profiled/*
|
||||
$(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln
|
||||
$(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln *.html
|
||||
$(RM) -f ../libcom_err.a ../libcom_err_p.a
|
||||
|
||||
mostlyclean:: clean
|
||||
|
|
|
@ -537,4 +537,5 @@ for getting us started with ``discuss,'' for which this package was
|
|||
originally written; and everyone I've talked into --- I mean, asked to read
|
||||
this document and the ``man'' pages.
|
||||
|
||||
@contents
|
||||
@bye
|
||||
|
|
Loading…
Reference in New Issue