doc: Build html into subdirectory (fix make clean)

Building with a document specific prefix will require coding
in both texi2any and texi2html. It is easier to build into
a directory (e.g. $(PROJECT)/). This also fixes "make clean"
which was broken.
This commit is contained in:
Joel Sherrill
2013-02-26 12:53:27 -06:00
parent e517714b7c
commit 83b555fd4d
2 changed files with 11 additions and 7 deletions
+2 -2
View File
@@ -8,13 +8,13 @@ endif
# file naming consistent.
TEXI2HTML_ARGS=\
-D use-html --split node --node-files \
-o ./ \
-o $(PROJECT)/ \
--top-file index.html \
--init-file=$(top_builddir)/texi2html_init \
-I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
TEXI2ANY_ARGS=\
--html -D use-html --split node \
-o ./ \
-o $(PROJECT)/ \
--init-file=$(top_builddir)/texi2any_init \
-I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
+9 -5
View File
@@ -44,19 +44,17 @@ if USE_HTML
html_project_DATA =
MOSTLYCLEANFILES += $(PROJECT)*.html
html_project_DATA += *.html
MOSTLYCLEANFILES += $(PROJECT)/*.html
html_project_DATA += $(PROJECT)/*.html
# Share as much as possible between the texi2html and texi2any rules
*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
$(PROJECT)/*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
rm -rf $(PROJECT).html
if USE_TEXI2HTML
$(TEXI2HTML) $(TEXI2HTML_ARGS) --menu $< $<
-rm -rf $(PROJECT)
endif # USE_TEXI2HTML
if USE_TEXI2ANY
$(TEXI2ANY) $(TEXI2ANY_ARGS) $<
-rm -rf $(PROJECT)
endif # USE_TEXI2ANY
endif # USE_HTML
@@ -82,3 +80,9 @@ $(top_builddir)/common/rtems.texi: $(top_srcdir)/common/rtems.texi.in $(top_buil
$(top_srcdir)/common/rtems.texi.in > $(top_builddir)/common/rtems.texi
$(srcdir)/version.texi:
clean-local: clean-local-check
.PHONY: clean-local-check
clean-local-check:
-rm -rf $(PROJECT)