From ed7c62481834ddcbd2f695b0ea5f777c1ed3f481 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Tue, 1 Mar 2011 12:22:47 +0000
Subject: [PATCH] 0021196: [CEA 456] Integration and merge modification for
 debian packages

We think that building and installing the documentation should not
be the default behavior but reserved to interested users
---
 doc/docutils/Makefile.am   | 19 +++++++++----------
 doc/salome/gui/Makefile.am |  8 +++++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 5db2edb5a..995cd9415 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -31,6 +31,8 @@ if SPHINX_IS_OK
 html/index.html:$(RSTFILES)
 	make htm
 
+usr_docs: html/index.html
+
 endif
 
 EXTRA_DIST = archives
@@ -47,17 +49,17 @@ SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
 
 htm:
 	mkdir -p html doctrees
-	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
-	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
-	$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
+	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
+	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
+	$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html
 	@echo
 	@echo "Build finished. The HTML pages are in html."
 
 latex:
 	mkdir -p latex doctrees
-	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
-	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
-	$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
+	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
+	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
+	$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -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" \
@@ -74,10 +76,7 @@ RSTFILES= \
 
 EXTRA_DIST+= $(RSTFILES)
 
-EXTRA_DIST+= \
-	conf.py 
-
-install-data-local: html/index.html
+install-data-local:
 	test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
 	if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
 	cp -rf $$b"html"/* $(pydocdir) ; \
diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index 0179632aa..51cf5e4cc 100644
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -33,9 +33,11 @@ usr_docs: doxyfile
 
 docs: usr_docs
 
-install-data-local: usr_docs
-	$(INSTALL) -d $(DESTDIR)$(docdir)/gui
-	cp -rp KERNEL $(DESTDIR)$(docdir)/gui
+install-data-local:
+	if test -d KERNEL; then \
+	$(INSTALL) -d $(DESTDIR)$(docdir)/gui ; \
+	cp -rp KERNEL $(DESTDIR)$(docdir)/gui ; \
+	fi
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(docdir)/gui/KERNEL
-- 
2.39.2