[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/scripts
From:       David Faure <faure () kde ! org>
Date:       2005-01-07 17:11:08
Message-ID: 20050107171108.5A2C01CF47 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Allow me to specify --prefix in the configureflags for a given CVS module.


  M +5 -2      kde-build   1.116


--- kdesdk/scripts/kde-build  #1.115:1.116
@@ -749,7 +749,10 @@
   set_title "Configuring module $module..."
   if [ -n "$KDEBUILDDIR" ]; then
-    cmd_configure="$KDESRCDIR/$module/configure $CONFIGUREFLAGS --prefix=$KDEDIRS --with-qt-dir=$QTDIR"
+    cmd_configure="$KDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
   else
-    cmd_configure="./configure $CONFIGUREFLAGS --prefix=$KDEDIRS --with-qt-dir=$QTDIR"
+    cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
+  fi
+  if echo $CONFIGUREFLAGS | grep -v -- "--prefix=" 2>/dev/null >/dev/null; then
+    cmd_configure="$cmd_configure --prefix=$KDEDIRS"
   fi
   [ "$NICECOMPILE" = yes ] && cmd_configure="nice $cmd_configure"


[prev in list] [next in list] [prev in thread] [next in thread]