summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-10-11 17:57:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-10-11 17:57:21 +0900
commit6caf07a2fce46cb2400c8955374c0ef329bd4c5a (patch)
tree9093f297d101cbf12e0b749debbd7ab4ac954670
parentbaed758af333e84845c82b0ac438f1a8ed49afc0 (diff)
downloadtde-packaging-6caf07a2fce46cb2400c8955374c0ef329bd4c5a.tar.gz
tde-packaging-6caf07a2fce46cb2400c8955374c0ef329bd4c5a.zip
Fixed detection of location of tqt documentation files. This relates to bug 1859.
-rwxr-xr-xdebian/lenny/tdevelop/debian/rules4
-rwxr-xr-xdebian/squeeze/tdevelop/debian/rules4
-rwxr-xr-xubuntu/maverick/tdevelop/debian/rules4
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index 9d5bcbc87..690ea3c9b 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/tdevelop/debian/rules
@@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--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 @@ DEB_CMAKE_EXTRA_FLAGS := \
-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 b240d45ec..ced683e05 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/tdevelop/debian/rules
@@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--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 @@ DEB_CMAKE_EXTRA_FLAGS := \
-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 b240d45ec..ced683e05 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--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 @@ DEB_CMAKE_EXTRA_FLAGS := \
-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