Salome HOME
Fix configure problem (caused by previous integration).
authorvsr <vsr@opencascade.com>
Mon, 4 Oct 2010 09:57:42 +0000 (09:57 +0000)
committervsr <vsr@opencascade.com>
Mon, 4 Oct 2010 09:57:42 +0000 (09:57 +0000)
AC_PROG_MKDIR_P is not available for autoconf 2.59 (Debian Sarge, Mandriva 2006)

configure.ac
doc/docutils/Makefile.am

index ec12977..6551e4b 100644 (file)
@@ -71,9 +71,6 @@ dnl Export the AR macro so that it will be placed in the libtool file
 dnl correctly.
 export AR
 
-AC_PROG_MKDIR_P
-AC_SUBST(MKDIR_P)
-
 echo
 echo ---------------------------------------------
 echo testing make
index c076157..e1698bb 100644 (file)
@@ -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_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
+SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
 
 htm:
-       $(MKDIR_P) html doctrees
+       mkdir -p html doctrees
        PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
        LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
        $(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
@@ -52,7 +52,7 @@ htm:
        @echo "Build finished. The HTML pages are in html."
 
 latex:
-       $(MKDIR_P) latex doctrees
+       mkdir -p latex doctrees
        PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
        LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
        $(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
@@ -62,7 +62,7 @@ latex:
              "run these through (pdf)latex."
 
 html:
-       $(MKDIR_P) $@
+       mkdir -p $@
 
 RSTFILES= \
        index.rst \
@@ -75,7 +75,7 @@ EXTRA_DIST+= \
        conf.py 
 
 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; \
        cp -rf $$b"html"/* $(pydocdir) ; \
        if test -f $$b"latex"/smeshpy.pdf; then cp -f $$b"latex"/smeshpy.pdf $(pydocdir) ; fi;