Do not abort compilation if texi2html is not found

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9556 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-04-11 11:08:40 +00:00
parent a7692a5617
commit be673f8d89
2 changed files with 19 additions and 3 deletions

View file

@ -1,3 +1,10 @@
Wed Apr 11 12:03:55 2001 Nicola Pero <nicola@brainstorm.co.uk>
* documentation.make [TEXI_FILES] ($(INTERNAL_doc_NAME)_toc.html):
Do not abort if command fails (presumably because texi2html could
not be found). (internal-doc-install): Install html only if it
has been generated.
2001-04-09 Adam Fedor <fedor@gnu.org>
* Merge 1.0 branch back into main.

View file

@ -125,8 +125,12 @@ $(INTERNAL_doc_NAME).ps: $(INTERNAL_doc_NAME).dvi
$(GNUSTEP_DVIPS) $(GNUSTEP_DVIPS_FLAGS) \
$(INTERNAL_doc_NAME).dvi -o $@
# Some systems don't have GNUSTEP_TEXI2HTML. Simply don't build the
# HTML in these cases - but without aborting compilation. Below, we
# don't install the result if it doesn't exist.
$(INTERNAL_doc_NAME)_toc.html: $(TEXI_FILES)
$(GNUSTEP_TEXI2HTML) $(GNUSTEP_TEXI2HTML_FLAGS) \
-$(GNUSTEP_TEXI2HTML) $(GNUSTEP_TEXI2HTML_FLAGS) \
$(INTERNAL_doc_NAME).texi
$(INTERNAL_textdoc_NAME): $(TEXI_FILES) $(TEXT_MAIN)
@ -235,13 +239,18 @@ $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR):
# texi installation
#
ifneq ($(TEXI_FILES),)
# NB: Only install HTML if it has been generated
internal-doc-install::
$(INSTALL_DATA) $(INTERNAL_doc_NAME).ps \
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
$(INSTALL_DATA) $(INTERNAL_doc_NAME).info \
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
$(INSTALL_DATA) $(INTERNAL_doc_NAME)_*.html \
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
if [ -f $(INTERNAL_doc_NAME)_toc.html ]; then \
$(INSTALL_DATA) $(INTERNAL_doc_NAME)_*.html \
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); \
fi
internal-doc-uninstall::
rm -f \
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(INTERNAL_doc_NAME).ps