Fix problem with devdocs generation

doc/Makefile.am

@@ -27,3 +27,11 @@
 # source path
 #
 SUBDIRS= salome
+
+usr_docs:
+	(cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
+
+docs: usr_docs
+
+dev_docs:
+	(cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

doc/salome/gui/Makefile.am

@@ -41,12 +41,11 @@ usr_docs:
 	echo "Processing smeshDC.py file: "; \
 	$(doxygen) ./doxyfile_py; \
 	cd ./smeshpy_doc; \
-	filesl=`find .`; \
+	filesl=`find . -type f`; \
 	for filen in $${filesl}; do \
-	  sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > ./tmp; \
+	  sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > tmp; \
-	  sed 's/smesh:://g' ./tmp > ./tmp1; \
+	  sed 's/smesh:://g' tmp > $${filen}; \
 	  rm -f tmp; \
-	  mv -f tmp1 $${filen}; \
 	done; \
 	cd ..; \
 	echo "Running doxygen in directory: "`pwd`; \

doc/salome/tui/Makefile.am

@@ -31,25 +31,20 @@ dev_docs:
 	cp -fr $(srcdir)/SMESH ./INPUT; \
 	cp -f ./SMESH/doxyfile ./INPUT; \
 	cd INPUT; \
-	sed 's|../../../share/salome|$(top_srcdir)|' ./doxyfile > ./doxyfile1; \
-	sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-	mv -f doxyfile2 doxyfile1; \
 	echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
 	if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
-	  sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
+	  sed 's|python_extension_must_be_here|*.py|' doxyfile > doxyfile1; \
-	  mv -f doxyfile2 doxyfile1; \
-	  $(DOXYGEN) -u ./doxyfile1; \
 	else \
-	  sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
+	  sed 's|python_extension_must_be_here||' doxyfile > doxyfile1; \
-	  mv -f doxyfile2 doxyfile1; \
-	fi; \
-	if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
-	  sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
-	  mv -f doxyfile2 doxyfile1; \
 	fi; \
 	mv -f doxyfile1 doxyfile; \
+	if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
+	  sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' doxyfile > doxyfile1; \
+	  mv -f doxyfile1 doxyfile; \
+	fi; \
+	$(DOXYGEN) -u doxyfile; \
 	echo "Running doxygen in directory:"`pwd`; \
-	$(DOXYGEN) ./doxyfile; \
+	$(DOXYGEN) doxyfile; \
 	cd ../; \
 	cp -fr $(srcdir)/SMESH/sources/ SMESH ; \
 	rm -fr INPUT
@@ -58,3 +53,13 @@ doctuidir=$(docdir)/tui/SMESH
 
 nodist_doctui_DATA= SMESH/doxyfile
 EXTRA_DIST+= SMESH/doxyfile.in
+
+install-data-local:
+	if test -d SMESH; then \
+	  $(INSTALL) -d $(docdir)/tui ; \
+	  cp -rp SMESH $(docdir)/tui ; \
+	  find $(docdir)/tui -name CVS -prune -exec rm -rf {} ";" ; \
+	fi;
+
+uninstall-local:
+	rm -rf $(docdir)/tui/SMESH

doc/salome/tui/SMESH/doxyfile.in

@@ -37,8 +37,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
+STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
-		         ../../../build/salome
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -98,8 +97,8 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
+INPUT                  = @top_srcdir@/src \
-		         ../../../share/salome/idl
+		         @top_srcdir@/idl
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                =