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 89d4f6d0110aea1d05614a7a2b6361d0d434fef8..6946e7718d151576e4e4949a80e8a6a7294c3acf 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,8 +35,6 @@ docs: usr_docs
 
 usr_docs:
        (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
-       (cd docutils && $(MAKE) $(AM_MAKEFLAGS) 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 995cd94152c1fe39ee1081610f8db2216154946e..dbed1cc9155370d0c671f992e2205630efd0d77b 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 = archives
@@ -76,7 +74,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/Makefile.am b/doc/salome/gui/Makefile.am
index 51cf5e4cc9249700adc2d8efad123c522509a64f..185c1b4a2f9221f5780894a5c6af9fb0d8444a29 100644 (file)
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -33,7 +33,7 @@ usr_docs: doxyfile
 
 docs: usr_docs
 
-install-data-local:
+install-data-local: usr_docs
        if test -d KERNEL; then \
        $(INSTALL) -d $(DESTDIR)$(docdir)/gui ; \
        cp -rp KERNEL $(DESTDIR)$(docdir)/gui ; \