diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-07 20:35:20 +0100 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-07 21:51:48 +0100 |
| commit | edc33b2f22e790cfe3e60de869baf17d0c8c65e0 (patch) | |
| tree | ebd0258871c5838c68cc906b1874f87694d3c46d /debianpkg | |
| parent | doc: update .gitignore (diff) | |
| download | frr-edc33b2f22e790cfe3e60de869baf17d0c8c65e0.tar.xz frr-edc33b2f22e790cfe3e60de869baf17d0c8c65e0.zip | |
doc: fix make setup
Iron out all of the glitches with recursive Automake, 3rd-party
autogenerated Sphinx makefiles, building and installing 3 different
document formats under different targets, and handling clean.
* Implement all Automake-required targets for 3rd-party Makefiles
* Setup subdirectories for 3rd-party Makefiles
* Override implicit Automake document targets
* Clean up explicit targets for developer docs
* Move Sphinx-generated Makefile to an include file
* Update targets for debian packaging
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'debianpkg')
| -rwxr-xr-x | debianpkg/backports/ubuntu12.04/debian/rules | 4 | ||||
| -rwxr-xr-x | debianpkg/backports/ubuntu14.04/debian/rules | 4 | ||||
| -rwxr-xr-x | debianpkg/rules | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules index 83e5e9689..9a3ea1ffb 100755 --- a/debianpkg/backports/ubuntu12.04/debian/rules +++ b/debianpkg/backports/ubuntu12.04/debian/rules @@ -139,10 +139,10 @@ override_dh_auto_configure: override_dh_auto_build: ifeq ($(GENERATE_PDF), 1) - dh_auto_build -- -C doc user.pdf + dh_auto_build -- -C doc pdf endif rm -vf doc/user/_build/texinfo/frr.info - dh_auto_build -- -C doc frr.info + dh_auto_build -- -C doc info override_dh_auto_test: diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules index 64a3d7b63..20b821ead 100755 --- a/debianpkg/backports/ubuntu14.04/debian/rules +++ b/debianpkg/backports/ubuntu14.04/debian/rules @@ -143,10 +143,10 @@ override_dh_auto_build: # doc/ is a bit crazy ifeq ($(GENERATE_PDF), 1) - dh_auto_build -- -C doc user.pdf + dh_auto_build -- -C doc pdf endif rm -vf doc/_build/texinfo/frr.info - dh_auto_build -- -C doc frr.info + dh_auto_build -- -C doc info override_dh_auto_test: diff --git a/debianpkg/rules b/debianpkg/rules index 46f8f4802..82a514803 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -141,10 +141,10 @@ override_dh_auto_configure: override_dh_auto_build: # doc/ is a bit crazy ifeq ($(GENERATE_PDF), 1) - dh_auto_build -- -C doc user.pdf + dh_auto_build -- -C doc pdf endif rm -vf doc/user/_build/texinfo/frr.info - dh_auto_build -- -C doc frr.info + dh_auto_build -- -C doc info override_dh_auto_test: |