Fixed bug in docutils: SMESH installation failed when Sphinx was not found by configure

This commit is contained in:
barate 2011-05-12 15:32:16 +00:00
parent 97f942863f
commit b159d92e9d

View File

@ -24,14 +24,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
pydocdir = $(docdir)/tui/SMESH/docutils
.PHONY : latex
RSTFILES = \
index.rst \
overview.rst \
docapi.rst
if SPHINX_IS_OK
html/index.html:$(RSTFILES)
make htm
endif
EXTRA_DIST = $(RSTFILES)
SPHINXOPTS =
SOURCEDIR = $(srcdir)
@ -43,7 +41,12 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
htm:
.PHONY: latex
if SPHINX_IS_OK
html/index.html:$(RSTFILES)
mkdir -p html doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
@ -51,6 +54,13 @@ htm:
@echo
@echo "Build finished. The HTML pages are in html."
else
html/index.html:
@echo "Documentation for Python package not built. Sphinx was not present at configure time."
endif
latex:
mkdir -p latex doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
@ -61,16 +71,6 @@ latex:
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."
html:
mkdir -p $@
RSTFILES= \
index.rst \
overview.rst \
docapi.rst
EXTRA_DIST+= $(RSTFILES)
install-data-local: html/index.html
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
@ -84,5 +84,5 @@ clean-local:
-rm -rf html latex doctrees
if test -d "html"; then rm -rf html ; fi
disthook :
dist-hook:
-test -d html && cp -Rp html $(distdir)