[package] fix nvram_get checking on non-WGT634U (#4975)

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 191dec9..2049e2f 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 all: $(if $(DUMP),dumpinfo,compile)
 
 
 all: $(if $(DUMP),dumpinfo,compile)
 


@@ -79,6 +78,8 @@ define Build/DefaultTargets
 
   $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE)
 
   $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE)

+  $(STAMP_CONFIGURED) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig
+  $(STAMP_CONFIGURED) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig

   $(STAMP_CONFIGURED): $(STAMP_PREPARED)
        $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
        $(Build/Configure)
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)
        $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
        $(Build/Configure)


@@ -87,6 +88,8 @@ define Build/DefaultTargets
 
   $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE)
 
   $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE)

+  $(STAMP_BUILT) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig:$$(STAGING_DIR_HOST)/usr/lib/pkgconfig
+  $(STAMP_BUILT) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig

   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
        $(Build/Compile)
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
        $(Build/Compile)


@@ -156,7 +159,7 @@ endif
       ), $(BuildTarget/$(target)) \
     ) \
   )
       ), $(BuildTarget/$(target)) \
     ) \
   )

-  $(if $(DUMP),,$(call Build/DefaultTargets,$(1)))
+  $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1)))

 endef
 
 define pkg_install_files
 endef
 
 define pkg_install_files