gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup for versions of texi2html which put output in different places

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@37547 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-01-06 22:57:43 +00:00
parent 755e5f6003
commit 2c44a70ae8
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2014-01-06 Richard Frith-Macdonald <rfm@gnu.org>
* Instance/Documentation/texi.make:
Revert change from 2009-09-19 since texi2html now seems to be
behaving as expected. However, attempt to move any html files
from the subdirectory in case we are using a version which still
puts them there.
2014-01-06 Richard Frith-Macdonald <rfm@gnu.org>
* INSTALL:

25
Instance/Documentation/texi.make
View file

@ -63,7 +63,7 @@ endif
internal-doc-all_:: $(GNUSTEP_INSTANCE).info \
$(GNUSTEP_INSTANCE).pdf \
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html
$(GNUSTEP_INSTANCE).html
internal-textdoc-all_:: $(GNUSTEP_INSTANCE)
@ -88,9 +88,14 @@ $(GNUSTEP_INSTANCE).pdf: $(TEXI_FILES)
-$(GNUSTEP_TEXI2PDF) $(GNUSTEP_TEXI2PDF_FLAGS) $(ADDITIONAL_TEXI2PDF_FLAGS) \
$(GNUSTEP_INSTANCE).texi -o $@
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html: $(TEXI_FILES)
# Some versions of texi2html placed the html files in a subdirectory,
# so after running it we try to move any from the subdirectory to
# where they are expected.
$(GNUSTEP_INSTANCE).html: $(TEXI_FILES)
-$(GNUSTEP_TEXI2HTML) $(GNUSTEP_TEXI2HTML_FLAGS) $(ADDITIONAL_TEXI2HTML_FLAGS) \
$(GNUSTEP_INSTANCE).texi
$(GNUSTEP_INSTANCE).texi; \
mv $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html .; \
mv $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_*.html .
$(GNUSTEP_INSTANCE): $(TEXI_FILES) $(TEXT_MAIN)
-$(GNUSTEP_MAKETEXT) $(GNUSTEP_MAKETEXT_FLAGS) $(ADDITIONAL_MAKETEXT_FLAGS) \
@ -112,8 +117,8 @@ internal-doc-clean::
$(GNUSTEP_INSTANCE).tp \
$(GNUSTEP_INSTANCE).vr \
$(GNUSTEP_INSTANCE).vrs \
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html \
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_*.html \
$(GNUSTEP_INSTANCE).html \
$(GNUSTEP_INSTANCE)_*.html \
$(GNUSTEP_INSTANCE).ps.gz \
$(GNUSTEP_INSTANCE).tar.gz \
$(GNUSTEP_INSTANCE)/*$(END_ECHO)
@ -133,14 +138,14 @@ internal-doc-install_:: $(GNUSTEP_DOC_INFO)
if [ -f $(GNUSTEP_INSTANCE).info ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).info* $(GNUSTEP_DOC_INFO); \
fi
if [ -f i$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_toc.html ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_*.html \
if [ -f i$(GNUSTEP_INSTANCE)_toc.html ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)_*.html \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
fi
if [ -f $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html \
if [ -f $(GNUSTEP_INSTANCE).html ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).html \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_*.html \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)_*.html \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
fi

4
Instance/documentation.make
View file

@ -27,8 +27,8 @@ endif
# NB: Parallel building is not supported here (yet?).
#
# TODO: Remove DOCUMENT_TEXT_NAME and use only DOCUMENT_NAME. DOCUMENT_TEXT_NAME
# is only used by texi.make.
# TODO: Remove DOCUMENT_TEXT_NAME and use only DOCUMENT_NAME.
# DOCUMENT_TEXT_NAME is only used by texi.make.
#
# The names of the documents are in the DOCUMENT_NAME variable.