diff --git a/doc/salome/tui/GEOM/doxyfile.in b/doc/salome/tui/GEOM/doxyfile.in
index 79466b561..07673594b 100755
--- a/doc/salome/tui/GEOM/doxyfile.in
+++ b/doc/salome/tui/GEOM/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,13 +97,13 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-			 ../../../build/salome/src/GEOM_SWIG/geompy.py \
-		         ../../../share/salome/idl
+INPUT                  = @top_srcdir@/src \
+			 @top_builddir@/src/GEOM_SWIG/geompy.py \
+		         @top_srcdir@/idl
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
-EXCLUDE                = ../../../share/salome/src/GEOM_SWIG/geompy.py \
-			 ../../../share/salome/src/GEOM_SWIG/geompyDC.py
+EXCLUDE                = @top_srcdir@/src/GEOM_SWIG/geompy.py \
+			 @top_srcdir@/src/GEOM_SWIG/geompyDC.py
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 3af60efb9..d7b19acf0 100644
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -40,25 +40,20 @@ dev_docs: GEOM/doxyfile
 	cp -fr $(srcdir)/GEOM ./INPUT; \
 	cp -f ./GEOM/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; \
-	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; \
+	  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|' doxyfile > doxyfile1; \
+	  mv -f doxyfile1 doxyfile; \
+	fi; \
+	$(DOXYGEN) -u doxyfile; \
 	echo "Running doxygen in directory:"`pwd`; \
-	$(DOXYGEN) ./doxyfile; \
+	$(DOXYGEN) doxyfile; \
 	cd ../; \
 	cp -fr $(srcdir)/GEOM/sources/ GEOM/ ; \
 	rm -fr INPUT ; \
@@ -69,12 +64,13 @@ clean-local:
 
 install-data-local:
 	if test -d GEOM; then \
-	  $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \
-	  cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \
+	  $(INSTALL) -d $(docdir)/tui ; \
+	  cp -rp GEOM $(docdir)/tui ; \
+	  find $(docdir)/tui -name CVS -prune -exec rm -rf {} ";" ; \
 	fi;
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(docdir)/tui/GEOM
+	rm -rf $(docdir)/tui/GEOM
 
 doctuidir=$(docdir)/tui/GEOM