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>
This commit is contained in:
David Lamparter 2018-10-25 16:09:21 +02:00
parent fabbd66dce
commit 31bbde19e1
3 changed files with 11 additions and 3 deletions

View File

@ -97,7 +97,9 @@ Package: frr-doc
Section: doc Section: doc
Architecture: all Architecture: all
Depends: Depends:
${misc:Depends} ${misc:Depends},
libjs-jquery,
libjs-underscore
Suggests: frr Suggests: frr
Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation) Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation)
This package includes info files for frr, a free software which manages This package includes info files for frr, a free software which manages

View File

@ -1,2 +1,2 @@
tools tools/zebra.el
debian/README.Debian debian/README.Debian

View File

@ -95,7 +95,7 @@ endif
# #
ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
USE_DOC=--enable-doc USE_DOC=--enable-doc --enable-doc-html
else else
USE_DOC=--disable-doc USE_DOC=--disable-doc
endif endif
@ -171,6 +171,12 @@ endif
find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f
rm -rf debian/tmp/usr/include 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: override_dh_auto_build:
dh_auto_build -- $(MAKE_SILENT) dh_auto_build -- $(MAKE_SILENT)