Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b65a958
)
Patch for the generation of the documentation
author
gdd
<gdd>
Fri, 1 Oct 2010 15:06:10 +0000
(15:06 +0000)
committer
gdd
<gdd>
Fri, 1 Oct 2010 15:06:10 +0000
(15:06 +0000)
configure.ac
patch
|
blob
|
history
doc/docutils/Makefile.am
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 6551e4b4fe6ad4d0bbf547b9a5e19a5af1e61cdd..ec12977e2d913b0816c0bdc22a83471cc744f011 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-71,6
+71,9
@@
dnl Export the AR macro so that it will be placed in the libtool file
dnl correctly.
export AR
dnl correctly.
export AR
+AC_PROG_MKDIR_P
+AC_SUBST(MKDIR_P)
+
echo
echo ---------------------------------------------
echo testing make
echo
echo ---------------------------------------------
echo testing make
diff --git
a/doc/docutils/Makefile.am
b/doc/docutils/Makefile.am
index 26780d4f247a9d2e749e58c3b83cbb3479e8f52a..c076157b914ab8ae00a0d52e855e330f4437186d 100644
(file)
--- a/
doc/docutils/Makefile.am
+++ b/
doc/docutils/Makefile.am
@@
-28,14
+28,11
@@
pydocdir = $(docdir)/tui/SMESH/docutils
if SPHINX_IS_OK
if SPHINX_IS_OK
-pydoc_DATA=html/index.html
html/index.html:$(RSTFILES)
make htm
endif
html/index.html:$(RSTFILES)
make htm
endif
-EXTRA_DIST+= html
-
SPHINXOPTS =
SOURCEDIR = $(srcdir)
SPHINXBUILD = sphinx-build
SPHINXOPTS =
SOURCEDIR = $(srcdir)
SPHINXBUILD = sphinx-build
@@
-47,25
+44,25
@@
SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
htm:
SPHINX_LD_LIBRARY_PATH = $(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}; \
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
+ $(SPHINXBUILD) -
W -
b html $(ALLSPHINXOPTS) html
@echo
@echo "Build finished. The HTML pages are in html."
latex:
@echo
@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}; \
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) latex
+ $(SPHINXBUILD) -
W -
b latex $(ALLSPHINXOPTS) latex
@echo
@echo "Build finished; the LaTeX files are in latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."
html:
@echo
@echo "Build finished; the LaTeX files are in latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."
html:
-
mkdir -p
$@
+
$(MKDIR_P)
$@
RSTFILES= \
index.rst \
RSTFILES= \
index.rst \
@@
-77,16
+74,18
@@
EXTRA_DIST+= $(RSTFILES)
EXTRA_DIST+= \
conf.py
EXTRA_DIST+= \
conf.py
-install-data-local:
-
$(INSTALL) -d
$(pydocdir)
+install-data-local:
html/index.html
+
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;
uninstall-local:
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;
uninstall-local:
- chmod -R +w $(pydocdir)
- rm -rf $(pydocdir)/*
+ -test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/*
clean-local:
-rm -rf html latex doctrees
if test -d "html"; then rm -rf html ; fi
clean-local:
-rm -rf html latex doctrees
if test -d "html"; then rm -rf html ; fi
+
+disthook :
+ -test -d html && cp -Rp html $(distdir)