From bebff9a460ccce1a45419b1b3b1b98b91ab1460e Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 3 Mar 2011 16:01:03 +0000 Subject: [PATCH] 0021196: [CEA 456] Integration and merge modification for debian packages roll back kernel-install-without-docs.patch --- doc/Makefile.am | 2 -- doc/docutils/Makefile.am | 4 +--- doc/salome/gui/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 89d4f6d01..6946e7718 100644 --- 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 995cd9415..dbed1cc91 100644 --- 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 51cf5e4cc..185c1b4a2 100644 --- 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 ; \ -- 2.39.2