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

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

visu-fix-clean.patch
  This patch is for cleaning completely the build directory

diff --git a/doc/salome/gui/VISU/Makefile.am b/doc/salome/gui/VISU/Makefile.am
index 0dd6bca0cd906f4145a2ccc2388256040bca9585..bdaabc245ce4c853ed15f94cb503f6e088176f2d 100644 (file)
--- a/doc/salome/gui/VISU/Makefile.am
+++ b/doc/salome/gui/VISU/Makefile.am
@@ -43,22 +43,23 @@ docs: usr_docs
 clean-local:
        @for filen in `find . -maxdepth 1` ; do                 \
          case $${filen} in                                     \
-           ./Makefile | ./doxyfile | ./doxyfile_idl ) ;;       \
-           . | .. | ./static ) ;;                              \
+           ./Makefile* | ./doxyfile* | ./images | ./input | ./static ) ;;      \
+           . | .. | ./CVS ) ;;                                 \
            *) echo "Removing $${filen}" ; rm -rf $${filen} ;;  \
          esac ;                                                \
        done ;
 
-install-data-local: usr_docs
-       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/VISU
+install-data-local:
+       @if [ -e main.html ]; then                                                              \
+       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/VISU;                                             \
        @for filen in `find . -maxdepth 1` ; do                                                 \
          case $${filen} in                                                                     \
-           ./Makefile | ./doxyfile | ./doxyfile_idl ) ;;                                       \
-           ./doxyfile.bak | ./doxyfile_idl.bak ) ;;                                            \
+           ./Makefile* | ./doxyfile* ) ;;                                                      \
            . | .. | ./static ) ;;                                                              \
            *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/VISU ;;   \
          esac ;                                                                                \
-       done ;
+       done ;                                                                                  \
+       fi
 
 uninstall-local:
        rm -rf $(DESTDIR)$(docdir)/gui/VISU