[Lunar-commits] CVS: moonbase/cd/k3b BUILD,1.4,1.5 DEPENDS,1.4,1.5

[Florin Braescu]

Update of /var/cvs/lunar/moonbase/cd/k3b
In directory dbguin.lunar-linux.org:/tmp/cvs-serv12832

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


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/cd/k3b/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD	13 Oct 2003 20:01:31 -0000	1.4
+++ BUILD	24 Feb 2004 08:40:29 -0000	1.5
@@ -1,24 +1,17 @@
 (
-  QTDIR=/opt/lunar/qt/3
-  KDEDIR=/opt/lunar/kde/3
   export LDFLAGS="$LDFLAGS -z combreloc"
 
-  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                     \
-                 --disable-debug                      \
-                 --with-qt-dir=$QTDIR                 \
-                 --with-xinerama                      \
-                 $OPTS                                &&
+  ./configure  --prefix=${KDE_PREFIX:-$KDEDIR}      \
+               --with-qt-dir=${QT_PREFIX:-$QTDIR}   \
+               --disable-debug                      \
+	       --enable-final                       \
+               --enable-fast-malloc=full            \
+               --with-xinerama                      \
+               $OPTS                                &&
 
   sedit "s/CDPARANOIA_LIBS = =/CDPARANOIA_LIBS = -lcdda_paranoia -lcdda_interface/g" Makefile &&
   sedit "s/CDPARANOIA_LIBS = =/CDPARANOIA_LIBS = -lcdda_paranoia -lcdda_interface/g" src/Makefile &&
-  
-  make                 &&
-  prepare_install      &&
-  make install         
 
+  default_make
  
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/cd/k3b/DEPENDS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEPENDS	16 Nov 2003 16:44:48 -0000	1.4
+++ DEPENDS	24 Feb 2004 08:40:29 -0000	1.5
@@ -1,8 +1,9 @@
-depends  kdelibs3    &&
-depends  cdparanoia  &&
-depends  cdrtools    &&
-depends  cdrdao      &&
+depends  kdelibs3       &&
+depends  cdparanoia     &&
+depends  cdrtools       &&
+depends  cdrdao         &&
 depends	 "dvd+rw-tools" &&
+
 optional_depends  "transcode"  ""  ""  "for DivX/XviD encoding"  &&
 optional_depends  "libvorbis"  ""  ""  "for ogg vorbis support"  &&
 optional_depends  "vcdimager"  ""  ""  "to be able to burn VCDs/SVCDs"