From: eap <eap@opencascade.com>
Date: Tue, 1 Mar 2011 14:48:02 +0000 (+0000)
Subject: 0021196: [CEA 456] Integration and merge modification for debian packages
X-Git-Tag: Start_BR_19998_21191~54
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=476819a61840dbbd29b9b923e274416958c19fe5;p=modules%2Fgeom.git

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 73f4f232d..77013f6c6 100755
--- 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