From: Quentin Young <qlyoung@qlyoung.net>
Date: Tue, 20 Feb 2018 14:15:01 +0000 (-0500)
Subject: debianpkg: fixup bad target names
X-Git-Tag: frr-5.0-dev~165^2~25
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9cb4ba0a3eafaa414d5d7cc297d5411dbfe74a69;p=mirror%2Ffrr.git

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 6449743b9d..fb951965af 100755
--- 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 ce7f793ae2..bb5715b78d 100755
--- 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 bad20f04a2..943fba91e2 100644
--- 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 \