debianpkg: fixup bad target names

Signed-off-by: Quentin Young <qlyoung@qlyoung.net>

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index 6449743b9d78b3ecfbdfd64b9d209c6dc03e97f9..fb951965affcdd11189d3a6deb292ea8c15433ac 100755 (executable)
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -138,7 +138,7 @@ override_dh_auto_build:
 ifeq ($(GENERATE_PDF), 1)
        dh_auto_build -- -C doc user.pdf
 endif
-       rm -vf doc/user/_build/texinfo/FRR.info
+       rm -vf doc/user/_build/texinfo/frr.info
        dh_auto_build -- -C doc frr.info
 
 override_dh_auto_test:

diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index ce7f793ae297e18a4157db35b3e852b1bb747c85..bb5715b78d86fb5205013e55fbf5331725749282 100755 (executable)
--- a/debianpkg/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
@@ -142,8 +142,8 @@ override_dh_auto_build:
 ifeq ($(GENERATE_PDF), 1)
        dh_auto_build -- -C doc user.pdf
 endif
-       rm -vf doc/_build/texinfo/FRR.info
-       dh_auto_build -- -C doc user.info
+       rm -vf doc/_build/texinfo/frr.info
+       dh_auto_build -- -C doc frr.info
 
 override_dh_auto_test:
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index bad20f04a2464337c4f26cc177b785293065366a..943fba91e28010f35725b043447b194594a34940 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -68,7 +68,8 @@ endif
 # handled by subdir target
 man: ;
 
-FRR.info:
+# explicit targets
+frr.info:
        $(MAKE) -C user info
 
 user.pdf:
@@ -83,6 +84,11 @@ developer.pdf:
 developer.html:
        $(MAKE) -C developer html
 
+# info target, handled by automake installation
+install-data-local: frr.info
+       gzip < user/_build/texinfo/FRR.info > ${infodir}/FRR.info.gz
+       install-info user/_build/texinfo/FRR.info ${infodir}/dir
+
 # include sources for shipped docs
 EXTRA_DIST = manpages/defines.rst \
        manpages/ldpd.rst \