From c22f7378563813ead9cb5d1df818d8e8287de60d Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 3 Mar 2011 16:19:45 +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/GEOM/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 095363368..bef14657c 100644 --- 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 86da0a7b9..8a744e388 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+= 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 f6ece9d6c..644b5cc62 100755 --- 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 \