Fix problem with devdocs generation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a820687c86c7a5d0a040e0efa508464083b7fdd4..3343ff5542b9b09df468e1977cccf031bb53b66a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,3 +25,11 @@
 # $Header$
 #
 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/tui/GUI/doxyfile.in b/doc/salome/tui/GUI/doxyfile.in
index 5268ef9701da1e9207956a6f37a09f39a51c1155..8abdb4f723d1381b9c4af7b492e07b86d9e6568b 100755 (executable)
--- a/doc/salome/tui/GUI/doxyfile.in
+++ b/doc/salome/tui/GUI/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,10 +97,10 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/bin \
-                        ../../../share/salome/idl \
-                        ../../../build/salome/bin
+INPUT                  = @top_srcdir@/src \
+                        @top_srcdir@/bin \
+                        @top_srcdir@/idl \
+                        @top_builddir@/bin
 FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                = 

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 193a2761c0b57ba254c595976fcfead8410d735c..6a74285c8de871ab63a6aafc2ac76723584d188b 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -31,25 +31,20 @@ dev_docs:
        cp -fr $(srcdir)/GUI ./INPUT; \
        cp -f ./GUI/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)/GUI/sources/ GUI/ ; \
        rm -fr INPUT