Improve TUI documentation building.

diff --git a/doc/salome/tui/GEOM/doxyfile.in b/doc/salome/tui/GEOM/doxyfile.in
index 9d4d118dbb81325b938d751e7e2db2e5d5fd3c2a..cba99e1cabf307491b153268d587cb9e34772f97 100755 (executable)
--- a/doc/salome/tui/GEOM/doxyfile.in
+++ b/doc/salome/tui/GEOM/doxyfile.in
@@ -77,8 +77,7 @@ WARN_LOGFILE           = log.txt
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/idl \
-                        ../../../build/salome/bin
+                        ../../../share/salome/idl
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                = 

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index b5b8b77211a2197920279ed59086b4b84fe34bc3..b401ba21021afbdc9d0a53a8e8a12ced5f79780d 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -28,14 +28,14 @@ dev_docs:
        cp -fr $(srcdir)/GEOM ./INPUT; \
        cp -f ./GEOM/doxyfile ./INPUT; \
        cd INPUT; \
-       sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
+       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; \
+         $(DOXYGEN) -u ./doxyfile1; \
        else \
          sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
          mv -f doxyfile2 doxyfile1; \
@@ -46,9 +46,9 @@ dev_docs:
        fi; \
        mv -f doxyfile1 doxyfile; \
        echo "Running doxygen in directory:"`pwd`; \
-       $(doxygen) ./doxyfile; \
+       $(DOXYGEN) ./doxyfile; \
        cd ../; \
-       cp -fr $(srcdir)/GEOM/sources/ GEOM ; \
+       cp -fr $(srcdir)/GEOM/sources/ GEOM/ ; \
        rm -fr INPUT
 
 doctuidir=$(docdir)/tui/GEOM