[Lunar-commits] <moonbase> qt4: guard error-handling chain

[Paul Bredbury]

commit 1f717784e4cbbf0587601f191f0b3bdf2a422cc9
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Wed Jan 12 18:40:08 2011 +0700

    qt4: guard error-handling chain
    
    Because throwing qt4 onto the filesystem, when it hasn't properly
    compiled, is not pretty.
---
 qt4-apps/qt4/BUILD     |    2 +-
 qt4-apps/qt4/CONFIGURE |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 699b9fa..ac903b5 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -46,7 +46,7 @@
                -importdir /usr/share/doc/$MODULE       \
                $OPTS                                  &&
 
-  default_make  &&
+  default_make || exit 1
 
 # It wants to point moc_location and uic_location to ${prefix}/src/qt-everywhere-opensource-src-4.7.0-beta2/bin
 # and after much fiddling cannot get it to point them to /usr/bin. So lets just sedit these rascals.
diff --git a/qt4-apps/qt4/CONFIGURE b/qt4-apps/qt4/CONFIGURE
index f003485..3b398e8 100644
--- a/qt4-apps/qt4/CONFIGURE
+++ b/qt4-apps/qt4/CONFIGURE
@@ -1,5 +1,5 @@
 mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
-mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
+mquery MAKE_EXAMPLE_DEMOS "Build examples 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
 mquery MAKE_WEBKIT "Build the webkit plugin? ${PROBLEM_COLOR}Needed by kdelibs4${DEFAULT_COLOR}" y "-webkit" "-no-webkit"