[Lunar-commits] <moonbase> polkit-qt: putting this in /opt is caused more hassle than its worth.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sun Dec 13 10:43:55 CET 2009


commit dde8d747c8fd2f02c9c8b12c93a12308ef90e9d0
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Dec 13 04:43:55 2009 -0500

    polkit-qt: putting this in /opt is caused more hassle than its worth.
---
 qt4-apps/polkit-qt/BUILD   |   15 +++++++--------
 qt4-apps/polkit-qt/DETAILS |    1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/qt4-apps/polkit-qt/BUILD b/qt4-apps/polkit-qt/BUILD
index 169325d..85e2536 100644
--- a/qt4-apps/polkit-qt/BUILD
+++ b/qt4-apps/polkit-qt/BUILD
@@ -1,19 +1,18 @@
 (
 
-  KDE4_PREFIX=${KDE4_INSTALL_DIR:-/opt/lunar/kde/4}
-
-  sedit "s:lib64/automoc4:lib64/automoc4 $KDE4_PREFIX/lib/automoc4/:" cmake/modules/FindAutomoc4.cmake
-
-  BUILD_DIR="$SOURCE_DIRECTORY/build_dir"
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-buid" &&
 
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
-  mkdir $BUILD_DIR  &&
-  cd $BUILD_DIR     &&
+  sedit "s:lib64/automoc4:lib64/automoc4 $KDE4_INSTALL_DIR/lib/automoc4/:" cmake/modules/FindAutomoc4.cmake &&
+
+  mkdir $OOTB_DIR  &&
+  cd $OOTB_DIR     &&
 
   cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE            &&
+                           -DCMAKE_BUILD_TYPE=RELEASE             \
+                           $OPTS                                 &&
 
   default_make
 
diff --git a/qt4-apps/polkit-qt/DETAILS b/qt4-apps/polkit-qt/DETAILS
index 3b21dde..38c161d 100644
--- a/qt4-apps/polkit-qt/DETAILS
+++ b/qt4-apps/polkit-qt/DETAILS
@@ -3,7 +3,6 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$KDE_URL/stable/apps/KDE4.x/admin
       SOURCE_VFY=sha1:7418067732302ebef22c60e8c2e053e56a07c533
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.kde.org
          ENTERED=20090628
          UPDATED=20090805


More information about the Lunar-commits mailing list