Signed-off-by: Robert Schwebel <[email protected]>
---
rules/iptables.make | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/rules/iptables.make b/rules/iptables.make
index ae77ca5..154ab53 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -86,25 +86,14 @@ $(STATEDIR)/iptables.targetinstall:
@$(call install_fixup, iptables,DEPENDS,)
@$(call install_fixup, iptables,DESCRIPTION,missing)
-# install the basic libraries
- @$(call install_copy, iptables, 0, 0, 0644, -, \
- /usr/lib/libiptc.so.0.0.0)
- @$(call install_link, iptables, libiptc.so.0.0.0, /usr/lib/libiptc.so)
- @$(call install_link, iptables, libiptc.so.0.0.0, /usr/lib/libiptc.so.0)
-
- @$(call install_copy, iptables, 0, 0, 0644, -, \
- /usr/lib/libxtables.so.4.0.0)
- @$(call install_link, iptables, libxtables.so.4.0.0,
/usr/lib/libxtables.so)
- @$(call install_link, iptables, libxtables.so.4.0.0,
/usr/lib/libxtables.so.4)
-
-# IPv6 part
+# # install the basic libraries
+ @$(call install_lib, iptables, 0, 0, 0644, libiptc)
+ @$(call install_lib, iptables, 0, 0, 0644, libxtables)
+
+# # IPv6 part
ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES_MULTI
@$(call install_copy, iptables, 0, 0, 0755, -,
/usr/sbin/ip6tables-multi)
-
- @$(call install_copy, iptables, 0, 0, 0644, -, \
- /usr/lib/libip6tc.so.0.0.0)
- @$(call install_link, iptables, libip6tc.so.0.0.0, /usr/lib/libip6tc.so)
- @$(call install_link, iptables, libip6tc.so.0.0.0,
/usr/lib/libip6tc.so.0)
+ @$(call install_lib, iptables, 0, 0, 0644, libip6tc)
endif
ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES
@@ -131,11 +120,7 @@ endif
# IPv4 part
ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_MULTI
@$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/iptables-multi)
-
- @$(call install_copy, iptables, 0, 0, 0644, -, \
- /usr/lib/libip4tc.so.0.0.0)
- @$(call install_link, iptables, libip4tc.so.0.0.0, /usr/lib/libip4tc.so)
- @$(call install_link, iptables, libip4tc.so.0.0.0,
/usr/lib/libip4tc.so.0)
+ @$(call install_lib, iptables, 0, 0, 0644, libip4tc)
endif
ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES
--
1.7.1
--
ptxdist mailing list
[email protected]
