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

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

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