From afba890e587291b71d5fbb504143c3f570705e62 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 4 Mar 2009 14:58:30 +0000
Subject: [PATCH] Fix problem with make distcheck step

---
 doc/salome/Makefile.am     |  2 +-
 doc/salome/tui/Makefile.am | 24 ++++--------------------
 doc/salome/tui/doxyfile.in |  4 ++--
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 4d433e927..3c59afb8b 100644
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -41,4 +41,4 @@ dev_docs:
 EXTRA_DIST= main.dox install.dox \
 	    kernel_resources.dox kernel_services.dox \
 	    salome_application.dox unittests.dox \
-	    salome_file.dox batch.dox
+	    salome_file.dox
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index b06306d1e..bddfbcb90 100644
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -27,22 +27,11 @@
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 dev_docs:
-	echo "DOXYGEN SUPPORT PYTHON - $(DOXYGEN_WITH_PYTHON)"; \
-	if( test "x$(DOXYGEN_WITH_PYTHON)" = "xyes"); then \
-	  sed 's|python_extension_must_be_here|*.py|' ./doxyfile > ./doxyfile1; \
-	  $(DOXYGEN) -u ./doxyfile1; \
-	else \
-	  sed 's|python_extension_must_be_here||' ./doxyfile > ./doxyfile1; \
-	fi; \
-	echo "DOXYGEN SUPPORT STL - $(DOXYGEN_WITH_STL)"; \
-	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; \
-	fi; \
-	$(DOXYGEN) ./doxyfile1
+	$(DOXYGEN) -u doxyfile; \
+	$(DOXYGEN) doxyfile
 
 clean-local:
-	-rm -fr KERNEL log.txt doxyfile1.bak doxyfile1
+	-rm -fr KERNEL log.txt doxyfile.bak
 
 install-data-local:
 	if test -d KERNEL; then \
@@ -53,9 +42,4 @@ install-data-local:
 uninstall-local:
 	rm -rf $(DESTDIR)$(docdir)/tui/KERNEL
 
-EXTRA_DIST=static KERNEL/exemple
-
-dist-hook:
-	rm -rf $(distdir)/static/CVS ; \
-	rm -rf $(distdir)/KERNEL/exemple/CVS
-
+EXTRA_DIST = static
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 544dd2015..30541d872 100644
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -27,7 +27,7 @@ TAB_SIZE               = 5
 ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = @DOXYGEN_SUPPORT_STL@
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
 
@@ -77,7 +77,7 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 INPUT                  = \
 		       @top_srcdir@/src/DSC
-FILE_PATTERNS          = *.idl *.cxx *.hxx *.h *.hh *.i *c *.cc python_extension_must_be_here
+FILE_PATTERNS          = *.idl *.cxx *.hxx *.h *.hh *.i *c *.cc @DOXYGEN_PYTHON_EXTENSION@
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
-- 
2.39.2