[Lunar-commits] <moonbase> qt4: a alteration to BUILD and CONFIGURE. qdoc3 does not get built by

Dennis 'stumbles' Veatch stumbles at lunar-linux.org
Wed Jun 17 00:34:49 CEST 2009


commit ad1872791f2d728a1f1a77d255f0f37834af4b39
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Tue Jun 16 18:34:49 2009 -0400

    qt4: a alteration to BUILD and CONFIGURE. qdoc3 does not get built by
    
    default, and requries this jiggle to make it so. As the CONFIGURE addition
    notes, you'll want it for qt-creator.
---
 kde4/base/qt4/BUILD     |    8 ++++++++
 kde4/base/qt4/CONFIGURE |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
index ffa147a..f9cff7f 100644
--- a/kde4/base/qt4/BUILD
+++ b/kde4/base/qt4/BUILD
@@ -30,6 +30,14 @@
 
   default_make  &&
 
+  if [ "$MAKE_QDOC3" == "y" ]; then
+     cd tools/qdoc3 &&
+     qmake -unix -o Makefile qdoc3.pro &&
+     make    &&
+     install -D -m0755 qdoc3 $MODULE_PREFIX/tools/qdoc3/qdoc3 &&
+     cd $SOURCE_DIRECTORY
+  fi &&
+
   echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc  &&
   echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc  &&
   echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\"  \
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
index 189bb36..b39218a 100644
--- a/kde4/base/qt4/CONFIGURE
+++ b/kde4/base/qt4/CONFIGURE
@@ -1,3 +1,4 @@
 mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
 mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
 mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
+mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n


More information about the Lunar-commits mailing list