summaryrefslogtreecommitdiffstats
path: root/ubuntu/lucid_automake/applications/kchmviewer/debian
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
committerRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
commit5d7b5e6defb05f81691d286d40f67260c4733d00 (patch)
treeb2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/lucid_automake/applications/kchmviewer/debian
parent580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff)
parenta14ac9de2f5843036c9f452f1188979fef17ae6d (diff)
downloadtde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz
tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/lucid_automake/applications/kchmviewer/debian')
-rw-r--r--ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs2
-rwxr-xr-xubuntu/lucid_automake/applications/kchmviewer/debian/rules4
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs b/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs
index a0aa0550c..1efd0b6bb 100644
--- a/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/ubuntu/lucid_automake/applications/kchmviewer/debian/rules b/ubuntu/lucid_automake/applications/kchmviewer/debian/rules
index 4adaf88da..b28da52db 100755
--- a/ubuntu/lucid_automake/applications/kchmviewer/debian/rules
+++ b/ubuntu/lucid_automake/applications/kchmviewer/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
CONFIGURE_OPTIONS_KDE = \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \
- --includedir=/opt/kde3/include/kde --mandir=/opt/kde3/share/man \
+ --includedir=/opt/kde3/include/tde --mandir=/opt/kde3/share/man \
--with-qt-dir=$(qtdir) \
--sysconfdir=$(sysconfdir) \
--infodir=/opt/kde3/share/info \