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

  roll back kernel-install-without-docs.patch

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 095363368ac763ef73544dd15c510907eb24c774..bef14657ce9ca5e4dde0de6d8019f57e248d47c5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,10 +26,8 @@ SUBDIRS = salome docutils
 
 usr_docs:
        (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
-       (cd docutils && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
 docs: usr_docs
 
 dev_docs:
-       (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
        (cd docutils && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 86da0a7b92f954f068dd7506244e46484c0c161b..8a744e38847aa3d16bf9581ac563e722a81b5874 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -31,8 +31,6 @@ if SPHINX_IS_OK
 html/index.html:$(RSTFILES)
        make htm
 
-usr_docs: html/index.html
-
 endif
 
 EXTRA_DIST+= images
@@ -75,7 +73,7 @@ RSTFILES= \
 
 EXTRA_DIST+= $(RSTFILES)
 
-install-data-local:
+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) ; \

diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am
index f6ece9d6cb44614c6fcca35aebf9cdb2595fdfe6..644b5cc6203e4db5cec74b249cde6ff6f32eb90f 100755 (executable)
--- a/doc/salome/gui/GEOM/Makefile.am
+++ b/doc/salome/gui/GEOM/Makefile.am
@@ -61,7 +61,7 @@ clean-local:
          esac ;                                                                \
        done ;
 
-install-data-local:
+install-data-local: usr_docs
        @if [ -e main.html ]; then \
        $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \
        for filen in `find . -maxdepth 1` ; do                                                  \