0021196: [CEA 456] Integration and merge modification for debian packages

make docs to work in docutils and not to generate anything during make install

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 8a744e38847aa3d16bf9581ac563e722a81b5874..86da0a7b92f954f068dd7506244e46484c0c161b 100644 (file)
--- 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+= images
@@ -73,7 +75,7 @@ RSTFILES= \
 
 EXTRA_DIST+= $(RSTFILES)
 
-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) ; \