ar71xx: Fix LED polarity for the TP-LINK TL-MR13U.

[openwrt-14.07/.git] / include / package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 9783a632547b827882f0467c699ecca57b3e98e3..5c83b3d58bac37e5b83b4c3a0a212604eba05346 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -5,6 +5,8 @@
 # See /LICENSE for more information.
 #
 
+include $(INCLUDE_DIR)/feeds.mk
+
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
   ipkg-build -c -o 0 -g 0
@@ -74,7 +76,8 @@ endif
 
 ifeq ($(DUMP),)
   define BuildTarget/ipkg
-    IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
+    PDIR_$(1):=$(call FeedPackageDir,$(1))
+    IPKG_$(1):=$$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk
     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
 
@@ -133,7 +136,7 @@ ifeq ($(DUMP),)
 
     $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1))
     $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
-       @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
+       @rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
        mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
@@ -187,11 +190,12 @@ ifeq ($(DUMP),)
                )
     endif
 
-       $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+       $(INSTALL_DIR) $$(PDIR_$(1))
+       $(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1))
        @[ -f $$(IPKG_$(1)) ]
 
     $(1)-clean:
-       rm -f $(PACKAGE_DIR)/$(1)_*
+       rm -f $$(PDIR_$(1))/$(1)_*
 
     clean: $(1)-clean