X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fx11%2Fqt%2Fqt;h=9abe2d649ea4503eb8f255a30595578764aeeaff;hp=9cf6d77564d0c822ecd84628757d4d1bca6a3300;hb=44395e5227c39f31ee6dcebc41fcb9afb70087e5;hpb=5c31fce36bb2f759bb112595573c07b5f027ba3e

diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt
index 9cf6d77..9abe2d6 100644
--- a/packages/x11/qt/qt
+++ b/packages/x11/qt/qt
@@ -15,6 +15,10 @@ 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 $prefix/include/qt -docdir $docdir"
@@ -25,6 +29,13 @@ 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
 	for i in $prefix/lib/libqt-mt.so*; do
@@ -32,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