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

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

smesh-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/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am
index 1bb1e9beeb5951b492bb0ab8592dd14cb023bef6..8782564712fe15abee6d0b9ee9b33ff47756fece 100755 (executable)
--- a/doc/salome/gui/SMESH/Makefile.am
+++ b/doc/salome/gui/SMESH/Makefile.am
@@ -50,24 +50,24 @@ usr_docs: doxyfile_py doxyfile
 docs: usr_docs
 
 clean-local:
-       @for filen in `find . -maxdepth 1` ; do                 \
-         case $${filen} in                                     \
-           ./Makefile | ./doxyfile | ./doxyfile_py ) ;;        \
-           . | .. | ./static ) ;;                              \
-           *) echo "Removing $${filen}" ; rm -rf $${filen} ;;  \
-         esac ;                                                \
+       @for filen in `find . -maxdepth 1` ; do                                         \
+         case $${filen} in                                                             \
+           ./Makefile* | ./doxyfile* | ./images | ./input | ./static | ./CVS ) ;;      \
+           *) echo "Removing $${filen}" ; rm -rf $${filen} ;;                          \
+         esac ;                                                                        \
        done ;
 
-install-data-local: usr_docs
-       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/SMESH
-       @for filen in `find . -maxdepth 1` ; do                                                 \
+install-data-local:
+       @if [ -e main.html ]; then                                                              \
+       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/SMESH;                                            \
+       for filen in `find . -maxdepth 1` ; do                                                  \
          case $${filen} in                                                                     \
-           ./Makefile | ./doxyfile | ./doxyfile_py ) ;;                                        \
-           ./doxyfile.bak | ./doxyfile_py.bak ) ;;                                             \
+           ./Makefile* | ./doxyfile* ) ;;                                                      \
            . | .. | ./static ) ;;                                                              \
            *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/SMESH ;;  \
          esac ;                                                                                \
-       done ;
+       done ;                                                                                  \
+       fi
 
 uninstall-local:
        rm -rf $(DESTDIR)$(docdir)/gui/SMESH