mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-04-15 21:21:21 +05:00
Fixed bug in docutils: SMESH installation failed when Sphinx was not found by configure
This commit is contained in:
parent
97f942863f
commit
b159d92e9d
@ -24,14 +24,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
|
|||||||
|
|
||||||
pydocdir = $(docdir)/tui/SMESH/docutils
|
pydocdir = $(docdir)/tui/SMESH/docutils
|
||||||
|
|
||||||
.PHONY : latex
|
RSTFILES = \
|
||||||
|
index.rst \
|
||||||
|
overview.rst \
|
||||||
|
docapi.rst
|
||||||
|
|
||||||
if SPHINX_IS_OK
|
EXTRA_DIST = $(RSTFILES)
|
||||||
|
|
||||||
html/index.html:$(RSTFILES)
|
|
||||||
make htm
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
SPHINXOPTS =
|
SPHINXOPTS =
|
||||||
SOURCEDIR = $(srcdir)
|
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
|
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
|
mkdir -p html doctrees
|
||||||
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
||||||
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
|
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
|
||||||
@ -51,6 +54,13 @@ htm:
|
|||||||
@echo
|
@echo
|
||||||
@echo "Build finished. The HTML pages are in html."
|
@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:
|
latex:
|
||||||
mkdir -p latex doctrees
|
mkdir -p latex doctrees
|
||||||
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
|
||||||
@ -61,16 +71,6 @@ latex:
|
|||||||
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
|
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
|
||||||
"run these through (pdf)latex."
|
"run these through (pdf)latex."
|
||||||
|
|
||||||
html:
|
|
||||||
mkdir -p $@
|
|
||||||
|
|
||||||
RSTFILES= \
|
|
||||||
index.rst \
|
|
||||||
overview.rst \
|
|
||||||
docapi.rst
|
|
||||||
|
|
||||||
EXTRA_DIST+= $(RSTFILES)
|
|
||||||
|
|
||||||
install-data-local: html/index.html
|
install-data-local: html/index.html
|
||||||
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
|
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
|
||||||
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
|
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
|
||||||
@ -84,5 +84,5 @@ clean-local:
|
|||||||
-rm -rf html latex doctrees
|
-rm -rf html latex doctrees
|
||||||
if test -d "html"; then rm -rf html ; fi
|
if test -d "html"; then rm -rf html ; fi
|
||||||
|
|
||||||
disthook :
|
dist-hook:
|
||||||
-test -d html && cp -Rp html $(distdir)
|
-test -d html && cp -Rp html $(distdir)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user