aboutsummaryrefslogtreecommitdiffstats
path: root/package/iptables
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-03-06 12:03:54 +0000
committerNicolas Thill <nico@openwrt.org>2005-03-06 12:03:54 +0000
commit95ab18e175d33954f8ce7d59af01eaf79767eaf4 (patch)
tree3d71937c64207297f0ce7fb2cbe33cd9a384b343 /package/iptables
parentf03c7796adde4d9461ad53d236bd2f2e0fe6f4e2 (diff)
downloadupstream-95ab18e175d33954f8ce7d59af01eaf79767eaf4.tar.gz
upstream-95ab18e175d33954f8ce7d59af01eaf79767eaf4.tar.bz2
upstream-95ab18e175d33954f8ce7d59af01eaf79767eaf4.zip
Add package install dependencies (don't install a package if it's already installed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@315 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/iptables')
-rw-r--r--package/iptables/Makefile26
1 files changed, 18 insertions, 8 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 1a0c385f3f..67e4a2d737 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -28,6 +28,14 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),)
TARGETS += $(PKG_IP6T)
endif
+INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
+ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
+endif
+ifeq ($(BR2_PACKAGE_IP6TABLES),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
+endif
+
$(DL_DIR)/$(PKG_SOURCE_FILE):
mkdir -p $(DL_DIR)
$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
@@ -58,6 +66,9 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
+$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
+ $(IPKG) install $(PKG_IPT)
+
$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
@@ -67,6 +78,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
+$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
+ $(IPKG) install $(PKG_IPT_EXTRA)
+
$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_IP6T)/usr/sbin
@@ -79,18 +93,14 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
+$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
+ $(IPKG) install $(PKG_IP6T)
+
source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched
compile: $(TARGETS)
-install: compile
- $(IPKG) install $(PKG_IPT)
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
- $(IPKG) install $(PKG_IPT_EXTRA)
-endif
-ifeq ($(BR2_PACKAGE_IP6TABLES),y)
- $(IPKG) install $(PKG_IP6T)
-endif
+install: $(INSTALL_TARGETS)
clean:
rm -rf $(PKG_BUILD_DIR)