Fix problem with devdocs generation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f79641ee26abd59d9049a5d3ccbb59f9ed51dd03..3a7d0eda66cf20708ec726020295683dca1aa207 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,4 +21,10 @@
 #
 SUBDIRS= salome
 
-EXTRA_DIST= html
\ No newline at end of file
+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/tui/Makefile.am b/doc/salome/tui/Makefile.am
index fabf0fe1da52ee2601d1958fd8b00bef00b8b348..c54c264bf54b00d1357b99ef3b83da916a6f4aba 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -31,25 +31,20 @@ dev_docs:
        cp -fr $(srcdir)/VISU ./INPUT; \
        cp -f ./VISU/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)/VISU/sources/ VISU ; \
        rm -fr INPUT
@@ -58,3 +53,13 @@ doctuidir=$(docdir)/tui/VISU
 
 nodist_doctui_DATA= VISU/doxyfile
 EXTRA_DIST+= VISU/doxyfile.in
+
+install-data-local:
+       if test -d VISU; then \
+         $(INSTALL) -d $(docdir)/tui ; \
+         cp -rp VISU $(docdir)/tui ; \
+         find $(docdir)/tui -name CVS -prune -exec rm -rf {} ";" ; \
+       fi;
+
+uninstall-local:
+       rm -rf $(docdir)/tui/VISU

diff --git a/doc/salome/tui/VISU/doxyfile.in b/doc/salome/tui/VISU/doxyfile.in
index 8a30d7a705d687c13fbe4877a2d501647abc95f3..0103963b53bc238c68c250dc45990484bb2e3c07 100755 (executable)
--- a/doc/salome/tui/VISU/doxyfile.in
+++ b/doc/salome/tui/VISU/doxyfile.in
@@ -36,8 +36,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
@@ -97,8 +96,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          = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                =