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 <equinox@diac24.net>

diff --git a/debianpkg/control b/debianpkg/control
index ddae0c928b22181e34ebd53ccc68abc7bd33c597..c7a531ed5461fb6fa20b80dac6ef5330c20ac019 100644 (file)
--- 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 f72aae1967199cb7af8ac76ab6ed19e3198d893f..34dbbd7bc75beea3b133b999230d613b5154243c 100644 (file)
--- 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 263dbfd20998f683deab8f6295f462360e090363..9ee866298ad0089de1b9938869199861deabdea8 100755 (executable)
--- 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)