[Lunar-commits] <moonbase> qscintilla2: tweak the BUILD file and the install path.

[Florin Braescu]

commit e19fd816b7a9a7a5218b438bc7a78ddfc83db17a
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Sep 14 20:31:38 2008 +0300

    qscintilla2: tweak the BUILD file and the install path.
---
 qt-apps/qscintilla2/BUILD   |   21 +++++++++------------
 qt-apps/qscintilla2/DETAILS |    1 +
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/qt-apps/qscintilla2/BUILD b/qt-apps/qscintilla2/BUILD
index 35a69d2..5b00b9e 100644
--- a/qt-apps/qscintilla2/BUILD
+++ b/qt-apps/qscintilla2/BUILD
@@ -1,19 +1,16 @@
 (
 
-  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
+  if module_installed qt4; then
+    source /etc/profile.d/qt4.rc
+    cd Qt4
+  else
+    if module_installed qt3; then
+      source /etc/profile.d/qt3.rc
+      cd ../Qt3
+    fi
+  fi
   qmake -o Makefile qscintilla.pro
   default_make
-  fi
 
 ) > $C_FIFO 2>&1
diff --git a/qt-apps/qscintilla2/DETAILS b/qt-apps/qscintilla2/DETAILS
index c4999ae..769f6ee 100644
--- a/qt-apps/qscintilla2/DETAILS
+++ b/qt-apps/qscintilla2/DETAILS
@@ -4,6 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
       SOURCE_URL=http://www.riverbankcomputing.com/static/Downloads/QScintilla2
       SOURCE_VFY=sha1:f570df8e7bcfc1281a477a21a12036023de6535a
+   MODULE_PREFIX=${QTDIR:-/opt/lunar/qt/4}
         WEB_SITE=http://www.riverbankcomputing.co.uk/qscintilla
          ENTERED=20070528
          UPDATED=20080229