rename PKG_CONFIGURE_PATH to CONFIGURE_PATH for consistency
authorFelix Fietkau <nbd@openwrt.org>
Sun, 25 Feb 2007 23:55:53 +0000 (23:55 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 25 Feb 2007 23:55:53 +0000 (23:55 +0000)
SVN-Revision: 6376

include/package.mk

index 0400d08..c8a2a6a 100644 (file)
@@ -14,7 +14,6 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
-PKG_CONFIGURE_PATH:=.
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
@@ -313,12 +312,14 @@ CONFIGURE_VARS:= \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
+CONFIGURE_PATH:=.
+
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
        if [ -x configure ]; then \
                $(CONFIGURE_VARS) \
                $(2) \
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
        if [ -x configure ]; then \
                $(CONFIGURE_VARS) \
                $(2) \
-               $(PKG_CONFIGURE_PATH)/configure \
+               $(CONFIGURE_PATH)/configure \
                $(CONFIGURE_ARGS) \
                $(1); \
        fi; \
                $(CONFIGURE_ARGS) \
                $(1); \
        fi; \