Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (5aa0b97fe0011a4505607ae92e0d0d921fd00d08)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (5aa0b97fe0011a4505607ae92e0d0d921fd00d08)
  • Date: Sun, 22 Feb 2009 08:48:07 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

devel/doxygen/BUILD | 6 +++---
devel/doxygen/HISTORY | 5 +++++
devel/doxygen/PRE_BUILD | 3 ---
3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 5aa0b97fe0011a4505607ae92e0d0d921fd00d08
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

doxygen: Fix setting of QTDIR. (Sourcing /etc/profile.d/qt.sh is incorrect
as this file comes from qt-x11, not qt4.)

diff --git a/devel/doxygen/BUILD b/devel/doxygen/BUILD
index b273d30..3313b84 100755
--- a/devel/doxygen/BUILD
+++ b/devel/doxygen/BUILD
@@ -1,5 +1,5 @@
-OPTS="${ENGLISH} ${OPTS}" &&
-# rm src/unistd.h &&
-./configure --prefix ${INSTALL_ROOT}/usr \
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" \
+OPTS="$ENGLISH $OPTS" \
+./configure --prefix "$INSTALL_ROOT/usr" \
$OPTS &&
make
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 4b36ebf..c806f79 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,8 @@
+2009-02-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD, BUILD: Fix setting of QTDIR. (Sourcing
+ /etc/profile.d/qt.sh is incorrect as this file comes from
+ qt-x11, not qt4.)
+
2008-12-29 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.5.8
* DEPENDS: doxywizard now optonal_depends on qt4
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 53f2cd6..37704ea 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -9,9 +9,6 @@ sedit "s:man/man1:share/man/man1:" Makefile.in &&


if is_depends_enabled $SPELL qt4; then
- if [[ -z $QTDIR ]]; then
- source $INSTALL_ROOT/etc/profile.d/qt.sh
- fi &&
patch -p0 < $SCRIPT_DIRECTORY/moc.patch
patch -p0 < $SCRIPT_DIRECTORY/doxygen-qt4.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (5aa0b97fe0011a4505607ae92e0d0d921fd00d08), Juuso Alasuutari, 02/22/2009

Archive powered by MHonArc 2.6.24.

Top of Page