[Lunar-commits] CVS: moonbase/kde3/kdelibs3 BUILD, 1.6, 1.7 DEPENDS, 1.5, 1.6

[Florin Braescu]

Update of /var/cvs/lunar/moonbase/kde3/kdelibs3
In directory dbguin.lunar-linux.org:/tmp/cvs-serv14912/kdelibs3

Modified Files:
	BUILD DEPENDS 
Log Message:
a second commit for the new install scheme of kde.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/kdelibs3/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	18 Jan 2004 13:23:07 -0000	1.6
+++ BUILD	26 Feb 2004 13:59:08 -0000	1.7
@@ -1,21 +1,16 @@
 (
-  QTDIR=/opt/lunar/qt/3
-  KDEDIR=/opt/lunar/kde/3 
-
-  export LD_LIBRARY_PATH=$QTDIR/lib
-  export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
-  export LD_RUN_PATH=$KDEDIR/lib:$KDEDIR/lib/kde3
-
-  ./configure    --prefix=$KDEDIR       \
-                 --enable-final         \
-                 --disable-debug        \
-                 --with-qt-dir=$QTDIR   \
-                 --with-xinerama        \
-                 $OPTS                  &&
+  export LD_LIBRARY_PATH=${QT_PREFIX:-$QTDIR}/lib
+  export PATH=${QT_PREFIX:-$QTDIR}/bin:${KDE_PREFIX:-$KDEDIR}/bin:$PATH
+  export LD_RUN_PATH=${KDE_PREFIX:-$KDEDIR}/lib:${KDE_PREFIX:-$KDEDIR}/lib/kde3
+ 
+  ./configure  --prefix=${KDE_PREFIX:-$KDEDIR}      \
+               --with-qt-dir=${QT_PREFIX:-$QTDIR}   \
+               --disable-debug                      \
+	       --enable-final                       \
+               --enable-fast-malloc=full            \
+               --with-xinerama                      \
+               $OPTS                                &&
 
-  make             &&
-  prepare_install  &&
-  make install         
+  default_make
  
 ) > $C_FIFO 2>&1
-		   

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/kdelibs3/DEPENDS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DEPENDS	18 Jan 2004 13:23:07 -0000	1.5
+++ DEPENDS	26 Feb 2004 13:59:08 -0000	1.6
@@ -1,11 +1,11 @@
-depends  "arts"                &&
-depends  "docbook-sgml"        &&
-depends  "pcre"                &&
-depends  "libxslt"             &&
-depends  "tiff"                &&
+depends  arts          &&
+depends  docbook-sgml  &&
+depends  pcre          &&
+depends  libxslt       &&
+depends  tiff          &&
 
-optional_depends  "alsa-lib"    "--with-alsa" ""     "for alsa support"  &&
-optional_depends  "cups"        "" "--disable-cups"  "for cups support"  &&
-optional_depends  "libart_lgpl" "" "" "for SVG icon support"             &&
+optional_depends  "alsa-lib"    "--with-alsa" ""                "for alsa support"      &&
+optional_depends  "libart_lgpl" ""            ""                "for SVG icon support"  &&
+optional_depends  "cups"        ""            "--disable-cups"  "for cups support"      &&
 optional_depends  "openssl"  "--with-ssl-dir=/usr"  "--without-ssl" \
-                                                    "for openssl support"
+                                                                "for openssl support"