CHANGELOG 2005-08-17

[hdw-linux/hdw-linux.git] / packages / x11 / qt / qt

diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt
index 826e30c..9abe2d6 100644 (file)
--- a/packages/x11/qt/qt
+++ b/packages/x11/qt/qt
@@ -15,13 +15,26 @@ pre_install()       {
        # modify configure, so it is none interactive
        sed 's/read acceptance/acceptance="yes"/' configure > configure_tmp
        mv -vf configure_tmp configure ; chmod 755 configure
+
+       # adjust qmake.conf directories (use ' instead of " to not eval $QTDIR)
+       sed -i -e 's:$(QTDIR)/include:&/qt:' -e 's:$(QTDIR)/lib:&/qt:' \
+               mkspecs/linux*/qmake.conf
                }
 
-confopt="-prefix $prefix -headerdir $root/usr/include/qt"
-confopt="$confopt -docdir $docdir"
-confopt="$confopt -system-zlib -thread -no-stl -no-g++-exceptions"
-confopt="$confopt -system-libpng -system-libjpeg -qt-gif"
-confopt="$confopt -plugin-imgfmt-mng"
+confopt="-prefix $prefix -headerdir $prefix/include/qt -docdir $docdir"
+confopt="$confopt -plugindir $prefix/lib/qt/plugins -datadir $prefix/share/qt"
+confopt="$confopt -translationdir $prefix/share/qt/translation"
+confopt="$confopt -sysconfdir $sysconfdir/qt"
+confopt="$confopt -thread -no-exceptions"
+confopt="$confopt -system-zlib -system-libpng -system-libjpeg -qt-gif"
+confopt="$confopt -plugin-imgfmt-mng -plugin-imgfmt-png"
+
+build_main()   {
+       ./configure $confopt
+       find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g"
+       make $make_conf
+       make $install_conf install
+               }
 
 post_install() {
        # compatibility symlinks
@@ -30,8 +43,8 @@ post_install()        {
        done
        # documentation
        mkdir -p $docdir
-       cp -r doc/man $prefix/man
-       cp -r examples $docdir
+       cp -v -r doc/man $prefix/man
+       cp -v -r examples $docdir
        # profile
        cat > $root/etc/profile.d/qt <<-EOP
 QTDIR=$prefix