[SM-Commit] GIT changes to master grimoire by Eric Sandall (829318fc22ff11f4a9c1d9daaa8d802e78b4afa2)

Eric Sandall scm at mail.sourcemage.org
Thu Jan 4 19:14:09 EST 2007


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 devel/doxygen/HISTORY   |    5 +++++
 devel/doxygen/PRE_BUILD |   11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 829318fc22ff11f4a9c1d9daaa8d802e78b4afa2
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Fix doxygen's compile with qt-x11 support when qt-x11 was just installed

diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index bd0a2af..8797cee 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,8 @@
+2007-01-04 Eric Sandall <eric at sandall.us>
+	* PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced
+	  until relogin, so we need to check for QTDIR and source qt.sh if
+	  the user wants QT support.
+
 2006-10-31 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to 1.5.1
 
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 3f63912..8b4c273 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -4,4 +4,13 @@ sedit  "s/grep fileutils/grep 'Free Soft
 CFLAGS="${CFLAGS//-O3/-O2}"                                                            &&
 sedit  "s/-O2/$CFLAGS/"  tmake/lib/linux-g++/tmake.conf                                &&
 sedit  "s/\$(QTDIR)\/include/\$(QTDIR)\/include\/qt/"  tmake/lib/linux-g++/tmake.conf  &&
-sedit  "s:man/man1:share/man/man1:"  Makefile.in
+sedit  "s:man/man1:share/man/man1:"  Makefile.in  &&
+
+source  "$GRIMOIRE/is_depends_enabled.function"  &&
+
+if  is_depends_enabled  $SPELL  qt-x11;  then
+  if  [[  -z  $QTDIR  ]];  then
+    echo QTDIR = $QTDIR > /tmp/doxy.qt
+    source  $TRACK_ROOT/etc/profile.d/qt.sh
+  fi
+fi



More information about the SM-Commit mailing list