[65497] trunk/base

[raimue at macports.org]

Revision: 65497
          http://trac.macports.org/changeset/65497
Author:   raimue at macports.org
Date:     2010-03-26 14:22:51 -0700 (Fri, 26 Mar 2010)
Log Message:
-----------
base:
Make tcldoc and tcldox work again after r53374 which pruned the PATH. Use tools
from ${prefix}/bin.

Revision Links:
--------------
    http://trac.macports.org/changeset/53374

Modified Paths:
--------------
    trunk/base/Doxyfile.in
    trunk/base/Makefile.in

Modified: trunk/base/Doxyfile.in
===================================================================
--- trunk/base/Doxyfile.in	2010-03-26 21:20:39 UTC (rev 65496)
+++ trunk/base/Doxyfile.in	2010-03-26 21:22:51 UTC (rev 65497)
@@ -93,7 +93,7 @@
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = 
 INPUT_FILTER           = 
-FILTER_PATTERNS        = *.tcl=tcl-dox
+FILTER_PATTERNS        = *.tcl=@prefix@/bin/tcl-dox
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -222,7 +222,7 @@
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
+DOT_PATH               = @prefix@/bin/
 DOTFILE_DIRS           = 
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2010-03-26 21:20:39 UTC (rev 65496)
+++ trunk/base/Makefile.in	2010-03-26 21:22:51 UTC (rev 65497)
@@ -88,10 +88,14 @@
 endif
 
 tcldoc:
-	find src -name '*.tcl' | xargs tcldoc --verbose --title "MacPorts Documentation" --force tcldoc
+	@[ -e "${prefix}/bin/tcldoc" ] \
+		|| { echo "Install tcldoc with MacPorts in ${prefix} first."; exit 1; }
+	find src -name '*.tcl' | xargs ${TCLDOC} --verbose --title "MacPorts Documentation" --force tcldoc
 
 tcldox:
-	doxygen
+	@[ -e "${prefix}/bin/doxygen" -a -e "${prefix}/bin/tcl-dox" -a -e "${prefix}/bin/dot" ] \
+		|| { echo "Install doxygen, tcl-dox and graphviz with MacPorts in ${prefix} first."; exit 1; }
+	${prefix}/bin/doxygen
 
 test::
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100326/d5900a54/attachment.html>