[ptxdist] [PATCH] quagga: fix configuration and install options

[ptxdist] [PATCH] quagga: fix configuration and install options

[Ladislav Michl]

fixes: 01a658fcec11 quagga: this patch adds quagga support to ptxdist

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/quagga.make | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/rules/quagga.make b/rules/quagga.make
index 1937a15f9..3b8f3916f 100644
--- a/rules/quagga.make
+++ b/rules/quagga.make
@@ -37,15 +37,15 @@ QUAGGA_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	$(GLOBAL_IPV6_OPTION) \
-	--$(call ptx/endis, PTXCONF_VTYSH)-vtysh \
-	--$(call ptx/endis, PTXCONF_ZEBRA)-zebra \
-	--$(call ptx/endis, PTXCONF_BGPD)-bgpd \
-	--$(call ptx/endis, PTXCONF_RIPD)-ripd \
-	--$(call ptx/endis, PTXCONF_RIPNGD)-ripngd \
-	--$(call ptx/endis, PTXCONF_OSPFD)-ospfd \
-	--$(call ptx/endis, PTXCONF_OSPF6D)-ospf6d \
-	--$(call ptx/endis, PTXCONF_BABELD)-babeld \
-	--$(call ptx/endis, PTXCONF_WATCHQUAGGA)-watchquagga \
+	--$(call ptx/endis, PTXCONF_QUAGGA_VTYSH)-vtysh \
+	--$(call ptx/endis, PTXCONF_QUAGGA_ZEBRA)-zebra \
+	--$(call ptx/endis, PTXCONF_QUAGGA_BGPD)-bgpd \
+	--$(call ptx/endis, PTXCONF_QUAGGA_RIPD)-ripd \
+	--$(call ptx/endis, PTXCONF_QUAGGA_RIPNGD)-ripngd \
+	--$(call ptx/endis, PTXCONF_QUAGGA_OSPFD)-ospfd \
+	--$(call ptx/endis, PTXCONF_QUAGGA_OSPF6D)-ospf6d \
+	--$(call ptx/endis, PTXCONF_QUAGGA_BABELD)-babeld \
+	--$(call ptx/endis, PTXCONF_QUAGGA_WATCHQUAGGA)-watchquagga \
 	--disable-doc \
 	--enable-isisd \
 	--enable-solaris \
@@ -91,40 +91,39 @@ $(STATEDIR)/quagga.targetinstall:
 	@$(call install_fixup, quagga,DESCRIPTION,missing)
 	@$(call install_lib, quagga, 0, 0, 0644, libzebra)
 
-ifdef PTXCONF_RIPD
+ifdef PTXCONF_QUAGGA_RIPD
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ripd)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/ripd.conf)
 endif
-ifdef PTXCONF_RIPNGD
+ifdef PTXCONF_QUAGGA_RIPNGD
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ripngd)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/ripngd.conf)
 endif
-ifdef PTXCONF_BABELD
+ifdef PTXCONF_QUAGGA_BABELD
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/babeld)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/babeld.conf)
 endif
-ifdef PTXCONF_BGPD
+ifdef PTXCONF_QUAGGA_BGPD
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/bgpd)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/bgpd.conf)
 endif
-ifdef PTXCONF_ZEBRA
+ifdef PTXCONF_QUAGGA_ZEBRA
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/zebra)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/zebra.conf)
 endif
-ifdef PTXCONF_OSPFD
+ifdef PTXCONF_QUAGGA_OSPFD
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospfd)
-	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospfclient)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/ospfd.conf)
 endif
-ifdef PTXCONF_OSPF6D
+ifdef PTXCONF_QUAGGA_OSPF6D
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospf6d)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/ospf6d.conf)
 endif
-ifdef PTXCONF_WATCHQUAGGA
+ifdef PTXCONF_QUAGGA_WATCHQUAGGA
 	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/watchquagga)
 endif
-ifdef PTXCONF_VTYSH
-	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/vtysh)
+ifdef PTXCONF_QUAGGA_VTYSH
+	@$(call install_copy, quagga, 0, 0, 0755, -, /usr/bin/vtysh)
 	@$(call install_alternative, quagga, 0, 0, 0644, /etc/vtysh.conf)
 endif
 
-- 
2.11.0



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de