[Lunar-commits] CVS: moonbase/kde3/qt3 BUILD, 1.11, 1.12 PRE_BUILD, 1.3, 1.4

[Florin Braescu]

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

Modified Files:
	BUILD PRE_BUILD 
Log Message:
fix the build script. i hope there will be no more problems with it.

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/BUILD,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BUILD	16 Aug 2004 20:52:04 -0000	1.11
+++ BUILD	26 Aug 2004 17:18:14 -0000	1.12
@@ -5,45 +5,42 @@
   export  PATH=$QTDIR/bin:$PATH
   export  LD_LIBRARY_PATH=$QTDIR/lib
 
-  sedit  "s/-O2/$CXXFLAGS/"   mkspecs/linux-g++/qmake.conf
-#  sedit  "s/MAKE=/MAKE=make/" configure
+  prepare_install  &&
 
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf  &&
 
-  echo  "yes"  |  ./configure  -release                       \
-                               -shared                        \
-                               -thread                        \
-                               -qt-gif                        \
-                               -plugin-imgfmt-mng             \
-                               -system-libpng                 \
-                               -system-libjpeg                \
-                               -system-zlib                   \
-                               -no-g++-exceptions             \
-                               -thread                        \
-                               -no-stl                        \
-                               -dlopen-opengl                 \
-                               -prefix ${QT_PREFIX:-$QTDIR}   \
-                               -xft                           \
-                               $OPTS                         &&
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
 
-#  sedit 's:strip "$(INSTALL_ROOT)${QT_PREFIX:-$QTDIR}/doc/html/"::'  src/Makefile &&
+  echo  "yes"  |  ./configure  -release                      \
+                               -shared                       \
+                               -thread                       \
+                               -qt-gif                       \
+                               -plugin-imgfmt-mng            \
+                               -system-libpng                \
+                               -system-libjpeg               \
+                               -system-zlib                  \
+                               -no-g++-exceptions            \
+                               -thread                       \
+                               -no-stl                       \
+                               -dlopen-opengl                \
+                               -prefix ${QT_PREFIX:-$QTDIR}  \
+                               -xft                          \
+                               $OPTS                        &&
 
-  case  $SAMPCOMP  in
+  case $SAMPCOMP in
     y|Y|j|J)
       make
       ;;
     *)
-      make  symlinks sub-src sub-tools
+      make symlinks sub-src sub-tools
       ;;
   esac  &&
 
-  rm bin/qmake &&     
-  cp qmake/qmake bin/qmake &&
-
-  prepare_install  &&
-  make  install    &&
+  rm bin/qmake              &&     
+  cp qmake/qmake bin/qmake  &&
+  make install              &&
 
-  case  $SAMPIN  in
+  case $SAMPIN in
     y|Y|j|J)
       mv examples  ${QT_PREFIX:-$QTDIR}  &&
       mv tutorial  ${QT_PREFIX:-$QTDIR}

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/PRE_BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PRE_BUILD	4 Mar 2004 07:07:40 -0000	1.3
+++ PRE_BUILD	26 Aug 2004 17:18:14 -0000	1.4
@@ -12,4 +12,4 @@
 begin the qt3 install process.
 EOF
 
-unpack $SOURCE
+default_pre_build