[Lunar-commits] CVS: moonbase/kde3/qt3 BUILD, 1.7, 1.8 DEPENDS, 1.5, 1.6 DETAILS, 1.12, 1.13 POST_INSTALL, 1.2, 1.3

[Florin Braescu]

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

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


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD	24 Sep 2003 14:47:09 -0000	1.7
+++ BUILD	26 Feb 2004 13:59:08 -0000	1.8
@@ -1,5 +1,4 @@
 (
-
   export  YACC=byacc
   export  QTDIR=$SOURCE_DIRECTORY
   export  PATH=$QTDIR/bin:$PATH
@@ -18,11 +17,11 @@
                                -no-g++-exceptions             \
                                -thread                        \
                                -no-stl                        \
-                               -prefix /opt/lunar/qt/3        \
+                               -prefix ${QT_PREFIX:-$QTDIR}   \
                                -xft                           \
                                $OPTS                         &&
 
-  sedit 's:strip "$(INSTALL_ROOT)/opt/lunar/qt/3/doc/html/"::'  src/Makefile &&
+#  sedit 's:strip "$(INSTALL_ROOT)${QT_PREFIX:-$QTDIR}/doc/html/"::'  src/Makefile &&
 
   case  $SAMPCOMP  in
     y|Y|j|J)
@@ -31,20 +30,20 @@
     *)
       make  symlinks sub-src sub-tools
       ;;
-  esac                     &&
+  esac              &&
 
-  prepare_install          &&
-  make  install            &&
+  prepare_install   &&
+  make  install     &&
 
   case  $SAMPIN  in
     y|Y|j|J)
-      mv examples  /opt/lunar/qt/3  &&
-      mv tutorial  /opt/lunar/qt/3
+      mv examples  ${QT_PREFIX:-$QTDIR}  &&
+      mv tutorial  ${QT_PREFIX:-$QTDIR}
       ;;
-  esac                     &&
+  esac  &&
 
-  if ! grep -q "/opt/lunar/qt/3/lib" /etc/ld.so.conf; then
-    echo "/opt/lunar/qt/3/lib" >> /etc/ld.so.conf
+  if ! grep -q "${QT_PREFIX:-$QTDIR}/lib" /etc/ld.so.conf; then
+    echo "${QT_PREFIX:-$QTDIR}/lib" >> /etc/ld.so.conf
   fi
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/DEPENDS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DEPENDS	15 Feb 2004 15:52:29 -0000	1.5
+++ DEPENDS	26 Feb 2004 13:59:08 -0000	1.6
@@ -1,12 +1,9 @@
-depends  byacc      &&
-depends  libungif   &&
-depends  libmng     &&
-depends  xserver    &&
+depends  byacc     &&
+depends  libungif  &&
+depends  libmng    &&
+depends  xserver   &&
 
 optional_depends  "mysql"                                                    \
                   "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
                   "-no-sql-mysql"                                            \
                   "for mysql database support"
-
-## TODO:
-# examine postgresql support and add ODBC module and support

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/DETAILS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- DETAILS	3 Jan 2004 18:51:17 -0000	1.12
+++ DETAILS	26 Feb 2004 13:59:08 -0000	1.13
@@ -25,7 +25,7 @@
 operating systems. The native C APIs are encapsulated in a set of 
 well-designed, fully object-oriented C++ classes. 
 
-Certain envrionment variables must be defined before compiling and using 
+Certain environment variables must be defined before compiling and using 
 applications that depend on qt3.
 QTDIR=/opt/lunar/qt/3
 PATH=/opt/lunar/qt/3/bin:$PATH

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kde3/qt3/POST_INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL	24 Nov 2002 02:33:19 -0000	1.2
+++ POST_INSTALL	26 Feb 2004 13:59:08 -0000	1.3
@@ -1,16 +1,10 @@
 rm -f $BOOST_LOCK
-if module_installed kdelibs3; then lin kdelibs3; fi
-if module_installed kdeartwork3; then lin kdeartwork3; fi
-if module_installed mosfet-liquid; then lin mosfet-liquid; fi
-if module_installed sip; then lin sip; fi
-if module_installed PyQt; then lin PyQt; fi
+if module_installed kdelibs3;     then lin kdelibs3;     fi
+if module_installed kdeartwork3;  then lin kdeartwork3;  fi
+if module_installed sip;          then lin sip;          fi
+if module_installed PyQt;         then lin PyQt;         fi
 
 cat << EOF
-Certain envrionment variables must be defined before compiling and using 
-applications that depend on qt3.
-QTDIR=/opt/lunar/qt/3
-PATH=/opt/lunar/qt/3/bin:\$PATH
-
-The order of the PATH variable is important if qt3 and qt2 both exist on the 
-same machine.
+Certain environment variables must be defined before compiling and using 
+applications that depend on qt3, QT_PREFIX and/or QTDIR. 
 EOF