From f1efa60f3998fcdb4374b27c586c13b5e9328e1c Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 25 Oct 2018 16:09:21 +0200 Subject: [PATCH] debianpkg: install HTML docs, drop tools/ No reason not to enable HTML docs really. Also why the f* were we installing the entire tools/ directory into the doc package? Signed-off-by: David Lamparter --- debianpkg/control | 4 +++- debianpkg/frr.docs | 2 +- debianpkg/rules | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debianpkg/control b/debianpkg/control index ddae0c928b..c7a531ed54 100644 --- a/debianpkg/control +++ b/debianpkg/control @@ -97,7 +97,9 @@ Package: frr-doc Section: doc Architecture: all Depends: - ${misc:Depends} + ${misc:Depends}, + libjs-jquery, + libjs-underscore Suggests: frr Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation) This package includes info files for frr, a free software which manages diff --git a/debianpkg/frr.docs b/debianpkg/frr.docs index f72aae1967..34dbbd7bc7 100644 --- a/debianpkg/frr.docs +++ b/debianpkg/frr.docs @@ -1,2 +1,2 @@ -tools +tools/zebra.el debian/README.Debian diff --git a/debianpkg/rules b/debianpkg/rules index 263dbfd209..9ee866298a 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -95,7 +95,7 @@ endif # ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) - USE_DOC=--enable-doc + USE_DOC=--enable-doc --enable-doc-html else USE_DOC=--disable-doc endif @@ -171,6 +171,12 @@ endif find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f rm -rf debian/tmp/usr/include +# use installed js libraries + -rm -f debian/tmp/usr/share/doc/frr/html/_static/jquery.js + ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/doc/frr/html/_static/jquery.js + -rm -f debian/tmp/usr/share/doc/frr/html/_static/underscore.js + ln -s /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/doc/frr/html/_static/underscore.js + override_dh_auto_build: dh_auto_build -- $(MAKE_SILENT) -- 2.39.5