summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2013-06-09 08:40:58 +0000
committerXavier Roche <xroche@users.noreply.github.com>2013-06-09 08:40:58 +0000
commitfad839ce715459872ae8a3381316d086cca7bc80 (patch)
tree47dbea9db36f40790afb06c8d0d0981553453bca
parent04288d28c6dd2e8fd9390bfe52a66acc9fac36b2 (diff)
Fixed html-related changes introduced in r344
-rwxr-xr-xdebian/rules39
1 files changed, 32 insertions, 7 deletions
diff --git a/debian/rules b/debian/rules
index f58f1c7..dc8b330 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,9 +57,27 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/httrack
-
+ dh_auto_install --destdir=$(CURDIR)/debian/httrack
+ ##$(MAKE) install DESTDIR=$(CURDIR)/debian/httrack
+
+ # place html files (doc, webhttrack files)
+
+ # remove symlink created by html/Makefile's install-data-hook
+ rm $(CURDIR)/debian/httrack/usr/share/httrack/html
+ # and put back in place data
+ mv $(CURDIR)/debian/httrack/usr/share/doc/httrack \
+ $(CURDIR)/debian/httrack/usr/share/httrack/html
+ # create symlink on the other side
+ mkdir $(CURDIR)/debian/httrack/usr/share/doc/httrack
+ ln -s ../../httrack/html \
+ $(CURDIR)/debian/httrack/usr/share/doc/httrack/html
+ # and put in place the two outer files
+ mv $(CURDIR)/debian/httrack/usr/share/httrack/html/httrack-doc.html \
+ $(CURDIR)/debian/httrack/usr/share/doc/httrack/httrack-doc.html
+ mv $(CURDIR)/debian/httrack/usr/share/httrack/html/history.txt \
+ $(CURDIR)/debian/httrack/usr/share/doc/httrack/history.txt
+
+ # place libraries and cleanup
mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/
mv $(CURDIR)/debian/httrack/usr/bin/htsserver \
$(CURDIR)/debian/httrack/usr/lib/httrack/
@@ -77,13 +95,20 @@ install: build
# Lintian overrides
mkdir -p $(CURDIR)/debian/httrack/usr/share/lintian/overrides
- cp $(CURDIR)/debian/httrack.lintian-overrides $(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack
- cp $(CURDIR)/debian/libhttrack-dev.lintian-overrides $(CURDIR)/debian/httrack/usr/share/lintian/overrides/libhttrack-dev
- cp $(CURDIR)/debian/httrack-doc.lintian-overrides $(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack-doc
+ cp $(CURDIR)/debian/httrack.lintian-overrides \
+ $(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack
+ cp $(CURDIR)/debian/libhttrack-dev.lintian-overrides \
+ $(CURDIR)/debian/httrack/usr/share/lintian/overrides/libhttrack-dev
+ cp $(CURDIR)/debian/httrack-doc.lintian-overrides \
+ $(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack-doc
dh_movefiles --sourcedir=debian/httrack
+
# don't move history file to httrack-doc
- mv $(CURDIR)/debian/httrack-doc/usr/share/doc/httrack/history.txt $(CURDIR)/debian/httrack/usr/share/doc/httrack/
+ mv $(CURDIR)/debian/httrack-doc/usr/share/doc/httrack/history.txt \
+ $(CURDIR)/debian/httrack/usr/share/doc/httrack/
+
+ # remove empty dirs
find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
# Build architecture-independent files here.