[Lunar-commits] r20157 - moonbase/trunk/zbeta/qt4

[Florin Braescu]

Author: florin
Date: 2006-05-20 19:54:35 +0000 (Sat, 20 May 2006)
New Revision: 20157

Modified:
   moonbase/trunk/zbeta/qt4/BUILD
Log:
bump the version from 4.1.2 to 4.1.3. bugfixes release.

Modified: moonbase/trunk/zbeta/qt4/BUILD
===================================================================
--- moonbase/trunk/zbeta/qt4/BUILD	2006-05-20 19:54:00 UTC (rev 20156)
+++ moonbase/trunk/zbeta/qt4/BUILD	2006-05-20 19:54:35 UTC (rev 20157)
@@ -1,34 +1,32 @@
 (
-  export  QTDIR=$SOURCE_DIRECTORY
-  export  PATH=$QTDIR/bin:$PATH
-  export  LD_LIBRARY_PATH=$QTDIR/lib
+  export QTDIR=$SOURCE_DIRECTORY
+  export PATH=$QTDIR/bin:$PATH
+  export LD_LIBRARY_PATH=$QTDIR/lib
 
   sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf  &&
 
-  echo "yes" | ./configure          \
-	       -prefix ${MODULE_PREFIX} \
-	       -release             \
-	       -fast		    \
-               -shared              \
-               -qt-gif              \
-               -system-libpng       \
-               -system-libjpeg      \
-               -system-libmng       \
-               -system-zlib         \
-               -no-exceptions       \
-               $OPTS                &&
+  echo "yes" | ./configure               \
+	       -prefix ${MODULE_PREFIX}  \
+	       -release         \
+	       -fast		\
+               -shared          \
+               -qt-gif          \
+               -system-libpng   \
+               -system-libjpeg  \
+               -system-libmng   \
+               -system-zlib     \
+               -no-exceptions   \
+               $OPTS           &&
 
-  make &&
-  prepare_install &&
-  make install &&
+  default_make  &&
 
   if ! grep -q "${MODULE_PREFIX}/lib" /etc/ld.so.conf; then
     echo "${MODULE_PREFIX}/lib" >> /etc/ld.so.conf
   fi &&
 
-  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc    &&
-  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc &&
-  echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\" \
+  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\"  \
 	>> $SOURCE_DIRECTORY/qt4.rc &&
 
   install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/