Branch: master

6caf07a2 2014-10-11 03:57:21 Michele Calgaro
Fixed detection of location of tqt documentation files. This relates to bug 1859.
M debian/lenny/tdevelop/debian/rules
M debian/squeeze/tdevelop/debian/rules
M ubuntu/maverick/tdevelop/debian/rules
diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index 9d5bcbc..690ea3c 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/tdevelop/debian/rules
@@ -53,7 +53,7 @@
 				--with-pic \
 				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \
 				--with-pythondir=/usr \
-				--with-qtdoc-dir=/usr/share/qt3/doc/html \
+#				--with-qtdoc-dir=/usr/share/tqt3/doc/html \
 				--prefix=/opt/trinity \
 				--with-extra-libs=/opt/trinity/lib
 
@@ -69,7 +69,7 @@
  -DWITH_BUILDTOOL_ALL="ON" \
  -DWITH_LANGUAGE_ALL="ON" \
  -DWITH_VCS_ALL="ON" \
- -DQT_DOCDIR="/usr/share/qt3/doc/html"
+ -DQTDIR="/usr/share/tqt3" 
 
 binary-install/tdevelop-trinity::
 	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules
index b240d45..ced683e 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/tdevelop/debian/rules
@@ -53,7 +53,7 @@
 				--with-pic \
 				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \
 				--with-pythondir=/usr \
-				--with-qtdoc-dir=/usr/share/qt3/doc/html \
+#				--with-qtdoc-dir=/usr/share/tqt3/doc/html \
 				--prefix=/opt/trinity \
 				--with-extra-libs=/opt/trinity/lib
 
@@ -69,7 +69,7 @@
  -DWITH_BUILDTOOL_ALL="ON" \
  -DWITH_LANGUAGE_ALL="ON" \
  -DWITH_VCS_ALL="ON" \
- -DQT_DOCDIR="/usr/share/qt3/doc/html"
+ -DQTDIR="/usr/share/tqt3" 
 
 binary-install/tdevelop-trinity::
 	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index b240d45..ced683e 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -53,7 +53,7 @@
 				--with-pic \
 				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \
 				--with-pythondir=/usr \
-				--with-qtdoc-dir=/usr/share/qt3/doc/html \
+#				--with-qtdoc-dir=/usr/share/tqt3/doc/html \
 				--prefix=/opt/trinity \
 				--with-extra-libs=/opt/trinity/lib
 
@@ -69,7 +69,7 @@
  -DWITH_BUILDTOOL_ALL="ON" \
  -DWITH_LANGUAGE_ALL="ON" \
  -DWITH_VCS_ALL="ON" \
- -DQT_DOCDIR="/usr/share/qt3/doc/html"
+ -DQTDIR="/usr/share/tqt3" 
 
 binary-install/tdevelop-trinity::
 	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps