let ipkg fail when a package file to be installed is not found

[openwrt.git] / openwrt / package / iptables / Makefile

diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index 38eb907..73156b9 100644 (file)
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -21,7 +21,7 @@ define IPKG_plugin_template
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables
-       for m in $(2); do \
+       for m in $$(patsubst xt_%,ipt_%,$(2)); do \
                $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \
        done
        @[ -z "$(3)" ] || $(MAKE) $(3)
@@ -72,11 +72,18 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
                
 $(IPKG_IPTABLES):
+       install -d -m0755 $(IDIR_IPTABLES)/etc/config
+       install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall
+       install -d -m0755 $(IDIR_IPTABLES)/etc/init.d
+       install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall
+       install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/
+       install -d -m0755 $(IDIR_IPTABLES)/usr/lib
+       install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib
        install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
        install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
-               $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
+               $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
        )
        $(RSTRIP) $(IDIR_IPTABLES)
        $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)
@@ -101,10 +108,12 @@ $(IPKG_IP6TABLES):
        $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
+               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               DESTDIR="$(STAGING_DIR)" \
+               install install-devel
 
 layer7-install:
        mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols