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

med-install-without-docs.patch
  We think that building and installing the documentation should not
be the default behavior but reserved to interested users

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 009fce1dce9dfd3c7553ac71711cd543d76973b2..9d0407e3af73ee9438c19ed00679ed0f07fd3c6e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,3 +22,5 @@ SUBDIRS = MEDMEM salome doxygen
 dev_docs:
        (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
 
+usr_docs:
+       (cd doxygen && $(MAKE) $(AM_MAKEFLAGS) html-local)

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 178b3c6885e1df5de1fb1b8e401de856f8b12649..efd0b7a744ffd73bdb8a5a3f54ee30dc4701d54c 100644 (file)
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -26,8 +26,10 @@ DOX_INPUT_FILE = Doxyfile_med_user
 guidocdir = $(docdir)/gui/MED
 guidoc_DATA = images/head.png
 
-install-data-local : html-local
-       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/MED
+install-data-local :
+       @if test -d doc_ref_user; then                                  \
+       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/MED;                      \
+       fi
        @if test -d doc_ref_user/html ; then                            \
          for filen in `find doc_ref_user/html -maxdepth 1 -type f` ; do\
            echo "Installing $${filen}" ;                               \