Fix problem with devdocs generation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fd88e1ee3c6e30b7a19833f55a8a9526a43a1f12..8af3bc4f72229929c9ae900f520f6f6f77e6b2d0 100644 (file)
--- a/doc/Makefile.am
+++ b/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)

diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index cd8775a4d082a3975a6fc8b9cb9ece5ac13dcf57..5b94bbafbc8000b494897982a5d18cf0c6f64841 100644 (file)
--- a/doc/salome/gui/Makefile.am
+++ b/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/smesh:://g' ./tmp > ./tmp1; \
+         sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > tmp; \
+         sed 's/smesh:://g' tmp > $${filen}; \
          rm -f tmp; \
-         mv -f tmp1 $${filen}; \
        done; \
        cd ..; \
        echo "Running doxygen in directory: "`pwd`; \

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 2139db94dcf1b7babd211fbc1c8d082bbaf99201..642b5f1d00e3880c69e26aa5283e15c688156163 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/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; \
-         mv -f doxyfile2 doxyfile1; \
-         $(DOXYGEN) -u ./doxyfile1; \
+         sed 's|python_extension_must_be_here|*.py|' doxyfile > doxyfile1; \
        else \
-         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
+         sed 's|python_extension_must_be_here||' doxyfile > 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|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
+         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' doxyfile > doxyfile1; \
+         mv -f doxyfile1 doxyfile; \
        fi; \
-       mv -f doxyfile1 doxyfile; \
+       $(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

diff --git a/doc/salome/tui/SMESH/doxyfile.in b/doc/salome/tui/SMESH/doxyfile.in
index aba8b9b67dce94b5dbf7b5a2555ea31e17c13a49..0e10c31ade62af83e5561a3d441f312fc73230c7 100755 (executable)
--- a/doc/salome/tui/SMESH/doxyfile.in
+++ b/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 \
-                        ../../../build/salome
+STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
 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 \
-                        ../../../share/salome/idl
+INPUT                  = @top_srcdir@/src \
+                        @top_srcdir@/idl
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                =