[Lunar-commits] CVS: moonbase/kde3/arts BUILD, 1.7, 1.8 DEPENDS, 1.4, 1.5

[Florin Braescu]

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

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/arts/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD	18 Jan 2004 13:23:07 -0000	1.7
+++ BUILD	26 Feb 2004 13:59:07 -0000	1.8
@@ -1,24 +1,22 @@
 (
-  export  PATH=/opt/lunar/qt/3/bin:$PATH
-  export  LD_LIBRARY_PATH=/opt/lunar/qt/3/lib
-
-  ./configure    --prefix=/opt/lunar/kde/3       \
-                 --enable-final                  \
-                 --disable-debug                 \
-                 --with-qt-dir=/opt/lunar/qt/3   \
-                 --with-xinerama                 \
-                 $OPTS                           &&
+  export  PATH=${QT_PREFIX:-$QTDIR}/bin:$PATH
+  export  LD_LIBRARY_PATH=${QT_PREFIX:-$QTDIR}/lib
+ 
+  ./configure  --prefix=${KDE_PREFIX:-$KDEDIR}      \
+               --with-qt-dir=${QT_PREFIX:-$QTDIR}   \
+               --enable-final                       \
+               --disable-debug                      \
+               --with-xinerama                      \
+               $OPTS                               &&
 
-  make             &&
-  prepare_install  &&
-  make install     &&
+  default_make
 
-  if ! grep -q "/opt/lunar/kde/3/lib" /etc/ld.so.conf; then
-    echo "/opt/lunar/kde/3/lib" >> /etc/ld.so.conf  
+  if ! grep -q "${KDE_PREFIX:-$KDEDIR}/lib" /etc/ld.so.conf; then
+    echo "${KDE_PREFIX:-$KDEDIR}/lib" >> /etc/ld.so.conf  
   fi 
 
-  if ! grep -q "/opt/lunar/kde/3/lib/kde3" /etc/ld.so.conf; then
-    echo "/opt/lunar/kde/3/lib/kde3" >> /etc/ld.so.conf
+  if ! grep -q "${KDE_PREFIX:-$KDEDIR}/lib/kde3" /etc/ld.so.conf; then
+    echo "${KDE_PREFIX:-$KDEDIR}/lib/kde3" >> /etc/ld.so.conf
   fi
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/arts/DEPENDS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEPENDS	18 Jan 2004 13:23:07 -0000	1.4
+++ DEPENDS	26 Feb 2004 13:59:07 -0000	1.5
@@ -1,5 +1,5 @@
-depends  "qt3"      &&
-depends  "glib-2"   &&
+depends  qt3     &&
+depends  glib-2  &&
 
 optional_depends  "alsa-lib"   "--with-alsa"  ""  "for alsa support"      &&
 optional_depends  "libmad"     ""             ""  "for mad support"       &&