Fixed directory configuration for KChmviewer in Debian/Ubuntu.

6 files changed, 24 insertions, 42 deletions

diff --git a/debian/lenny/applications/kchmviewer/debian/debiandirs b/debian/lenny/applications/kchmviewer/debian/debiandirs
index 4ef41159b..a190453fb 100644
--- a/debian/lenny/applications/kchmviewer/debian/debiandirs
+++ b/debian/lenny/applications/kchmviewer/debian/debiandirs
@@ -1,9 +1,9 @@
-export kde_prefix=/usr
+export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/usr/include/tde
-export infodir=/usr/share/info
-export mandir=/usr/share/man
+export kde_includedir=/opt/trinity/include/tde
+export infodir=/opt/trinity/share/info
+export mandir=/opt/trinity/share/man
 export qtdir=/usr/share/qt3
-export kde_cgidir=/usr/lib/cgi-bin
+export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/tde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index c22afc5a3..e3fdf7aac 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include debian/debiandirs
+
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -43,8 +39,6 @@ else
 	CFLAGS += -O2
 endif
 
--include debian/debiandirs
-
 build: debian/build-kde
 
 debian/build-kde:
diff --git a/debian/squeeze/applications/kchmviewer/debian/debiandirs b/debian/squeeze/applications/kchmviewer/debian/debiandirs
index 4ef41159b..a190453fb 100644
--- a/debian/squeeze/applications/kchmviewer/debian/debiandirs
+++ b/debian/squeeze/applications/kchmviewer/debian/debiandirs
@@ -1,9 +1,9 @@
-export kde_prefix=/usr
+export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/usr/include/tde
-export infodir=/usr/share/info
-export mandir=/usr/share/man
+export kde_includedir=/opt/trinity/include/tde
+export infodir=/opt/trinity/share/info
+export mandir=/opt/trinity/share/man
 export qtdir=/usr/share/qt3
-export kde_cgidir=/usr/lib/cgi-bin
+export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/tde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules
index c22afc5a3..e3fdf7aac 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/squeeze/applications/kchmviewer/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include debian/debiandirs
+
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -43,8 +39,6 @@ else
 	CFLAGS += -O2
 endif
 
--include debian/debiandirs
-
 build: debian/build-kde
 
 debian/build-kde:
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
index 4ef41159b..a190453fb 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
@@ -1,9 +1,9 @@
-export kde_prefix=/usr
+export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/usr/include/tde
-export infodir=/usr/share/info
-export mandir=/usr/share/man
+export kde_includedir=/opt/trinity/include/tde
+export infodir=/opt/trinity/share/info
+export mandir=/opt/trinity/share/man
 export qtdir=/usr/share/qt3
-export kde_cgidir=/usr/lib/cgi-bin
+export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/tde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules
index c22afc5a3..e3fdf7aac 100755
--- a/ubuntu/maverick/applications/kchmviewer/debian/rules
+++ b/ubuntu/maverick/applications/kchmviewer/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include debian/debiandirs
+
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -43,8 +39,6 @@ else
 	CFLAGS += -O2
 endif
 
--include debian/debiandirs
-
 build: debian/build-kde
 
 debian/build-kde: