mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-24 16:30:34 +05:00
Fix configure problem (caused by previous integration).
AC_PROG_MKDIR_P is not available for autoconf 2.59 (Debian Sarge, Mandriva 2006)
This commit is contained in:
parent
d51f12e37e
commit
6521e4304e
@ -71,9 +71,6 @@ dnl Export the AR macro so that it will be placed in the libtool file
|
|||||||
dnl correctly.
|
dnl correctly.
|
||||||
export AR
|
export AR
|
||||||
|
|
||||||
AC_PROG_MKDIR_P
|
|
||||||
AC_SUBST(MKDIR_P)
|
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo ---------------------------------------------
|
echo ---------------------------------------------
|
||||||
echo testing make
|
echo testing make
|
||||||
|
@ -41,10 +41,10 @@ ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
|
|||||||
|
|
||||||
SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages
|
SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages
|
||||||
|
|
||||||
SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
|
SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
|
||||||
|
|
||||||
htm:
|
htm:
|
||||||
$(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}; \
|
||||||
$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
|
$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
|
||||||
@ -52,7 +52,7 @@ htm:
|
|||||||
@echo "Build finished. The HTML pages are in html."
|
@echo "Build finished. The HTML pages are in html."
|
||||||
|
|
||||||
latex:
|
latex:
|
||||||
$(MKDIR_P) latex doctrees
|
mkdir -p latex 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}; \
|
||||||
$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
|
$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
|
||||||
@ -62,7 +62,7 @@ latex:
|
|||||||
"run these through (pdf)latex."
|
"run these through (pdf)latex."
|
||||||
|
|
||||||
html:
|
html:
|
||||||
$(MKDIR_P) $@
|
mkdir -p $@
|
||||||
|
|
||||||
RSTFILES= \
|
RSTFILES= \
|
||||||
index.rst \
|
index.rst \
|
||||||
@ -75,7 +75,7 @@ EXTRA_DIST+= \
|
|||||||
conf.py
|
conf.py
|
||||||
|
|
||||||
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; \
|
||||||
cp -rf $$b"html"/* $(pydocdir) ; \
|
cp -rf $$b"html"/* $(pydocdir) ; \
|
||||||
if test -f $$b"latex"/smeshpy.pdf; then cp -f $$b"latex"/smeshpy.pdf $(pydocdir) ; fi;
|
if test -f $$b"latex"/smeshpy.pdf; then cp -f $$b"latex"/smeshpy.pdf $(pydocdir) ; fi;
|
||||||
|
Loading…
Reference in New Issue
Block a user