From: eap <eap@opencascade.com>
Date: Wed, 2 Mar 2011 09:36:44 +0000 (+0000)
Subject: 0021196: [CEA 456] Integration and merge modification for debian packages
X-Git-Tag: V5_1_main_FINAL~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=79641ea92e2b3d911cf17dbd6c3ace4db49c718e;p=modules%2Fsmesh.git

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 1bb1e9bee..878256471 100755
--- 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