X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fdocutils%2FMakefile.am;h=7b6b916fb30e47bb659f2f8e23767d44ee93256e;hb=062f1da5dde14e9ca8755c2eda44cbe8850f1d3a;hp=c076157b914ab8ae00a0d52e855e330f4437186d;hpb=19ef864fd77802ba6b9e4d27424964c98156732f;p=modules%2Fsmesh.git

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index c076157b9..7b6b916fb 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -39,12 +39,12 @@ SPHINXBUILD     = sphinx-build
 PAPEROPT_a4     = -D latex_paper_size=a4
 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:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/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;