summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications/kdiff3/debian/rules
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-01-17 16:33:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-17 16:33:06 +0100
commit260bfe4337a99cbaf4a14c44e170f07083a7d97c (patch)
tree48629c30e0691464b7e7ab11eed29f9c17a494bf /ubuntu/raring/applications/kdiff3/debian/rules
parente6d7e8e6936e70e1d6a7d1f5df5171280befbfd1 (diff)
downloadtde-packaging-260bfe4337a99cbaf4a14c44e170f07083a7d97c.tar.gz
tde-packaging-260bfe4337a99cbaf4a14c44e170f07083a7d97c.zip
Fix kdiff3 FTBFS on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring/applications/kdiff3/debian/rules')
-rwxr-xr-xubuntu/raring/applications/kdiff3/debian/rules8
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/raring/applications/kdiff3/debian/rules b/ubuntu/raring/applications/kdiff3/debian/rules
index 19ea44a07..2ab87b0e9 100755
--- a/ubuntu/raring/applications/kdiff3/debian/rules
+++ b/ubuntu/raring/applications/kdiff3/debian/rules
@@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
- kde_htmldir=/opt/trinity/share/doc/tde/HTML
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
- mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
- mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
+ mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
+ mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
+ rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/