From 6521e4304eb690f2b3d93d1e9ec2c0325e0c37b0 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 4 Oct 2010 09:57:42 +0000 Subject: [PATCH] Fix configure problem (caused by previous integration). AC_PROG_MKDIR_P is not available for autoconf 2.59 (Debian Sarge, Mandriva 2006) --- configure.ac | 3 --- doc/docutils/Makefile.am | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index ec12977e2..6551e4b4f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am index c076157b9..e1698bb9e 100644 --- a/doc/docutils/Makefile.am +++ b/doc/docutils/Makefile.am @@ -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;