diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-03-06 12:03:54 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-03-06 12:03:54 +0000 |
| commit | 95ab18e175d33954f8ce7d59af01eaf79767eaf4 (patch) | |
| tree | 3d71937c64207297f0ce7fb2cbe33cd9a384b343 /package/iproute2/Makefile | |
| parent | f03c7796adde4d9461ad53d236bd2f2e0fe6f4e2 (diff) | |
| download | upstream-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/iproute2/Makefile')
| -rw-r--r-- | package/iproute2/Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index a2d52df116..ad2ba0094d 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,6 +1,6 @@ ############################################################# # -# ebtables +# iproute2 # ############################################################# include $(TOPDIR)/rules.mk @@ -53,6 +53,9 @@ $(PKG_IP): $(PKG_BUILD_DIR)/ip/ip $(PACKAGE_DIR) $(STRIP) $(PKG_IP_DIR)/usr/sbin/* $(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ip.list: $(PKG_IP) + $(IPKG) install $(PKG_IP) + $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_TC_DIR)/usr/sbin @@ -60,6 +63,9 @@ $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR) $(STRIP) $(PKG_TC_DIR)/usr/sbin/* $(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/tc.list: $(PKG_TC) + $(IPKG) install $(PKG_TC) + $(PACKAGE_DIR): mkdir -p $(PACKAGE_DIR) @@ -71,17 +77,17 @@ ifneq ($(BR2_PACKAGE_IPROUTE2_TC),) TARGETS += $(PKG_TC) endif -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(TARGETS) -install: ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y) - $(IPKG) install $(PKG_IP) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip.list endif ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y) - $(IPKG) install $(PKG_TC) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/tc.list endif +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(TARGETS) +install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) |