[Lunar-commits] <moonbase> qscintilla2: adjust BUILD and DEPENDS.

[Dennis 'stumbles' Veatch]

commit 729b06b7eeb84c812ea99336c4c0228a46655cc8
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Mar 14 13:26:42 2008 -0400

    qscintilla2: adjust BUILD and DEPENDS.
---
 qt-apps/qscintilla2/BUILD   |   17 +++++++++++++----
 qt-apps/qscintilla2/DEPENDS |    3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/qt-apps/qscintilla2/BUILD b/qt-apps/qscintilla2/BUILD
index 127b100..e028939 100644
--- a/qt-apps/qscintilla2/BUILD
+++ b/qt-apps/qscintilla2/BUILD
@@ -1,10 +1,19 @@
 (
 
-  . /etc/profile.d/qt3.rc
+  if module_installed qt4; then
+   . /etc/profile.d/qt4.rc
+   export PATH=$QTDIR/bin:$PATH
+   cd Qt4
+   qmake -o Makefile qscintilla.pro
+   default_make
+  fi  &&
 
+  if module_installed qt3; then
+  . /etc/profile.d/qt3.rc
   export PATH=$QTDIR/bin:$PATH
-  cd Qt3                            &&
-  qmake -o Makefile qscintilla.pro  &&
-  default_make                      
+  cd Qt3
+  qmake -o Makefile qscintilla.pro
+  default_make
+  fi
 
 ) > $C_FIFO 2>&1
diff --git a/qt-apps/qscintilla2/DEPENDS b/qt-apps/qscintilla2/DEPENDS
index 15f7e06..3157cda 100644
--- a/qt-apps/qscintilla2/DEPENDS
+++ b/qt-apps/qscintilla2/DEPENDS
@@ -1 +1,2 @@
-depends  qt3
+optional_depends  qt3 ""  ""  "for qt3 version of QScintilla"
+optional_depends  qt4 ""  ""  "for qt4 version of QScintilla"