move busybox init scripts from base-files into the busybox package and make them...

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index b4f16e2..4e67e73 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -14,14 +14,7 @@ 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
 

-define shvar
-V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
-endef
-
-define shexport
-$(call shvar,$(1))=$$(call $(1))
-export $(call shvar,$(1))
-endef
+export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)

 
 define Build/DefaultTargets
   ifeq ($(DUMP),)
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)


@@ -288,7 +281,7 @@ define Build/Prepare
 endef
 
 define Build/Configure/Default
 endef
 
 define Build/Configure/Default

-       (cd $(PKG_BUILD_DIR)/$(3); \
+       (cd $(PKG_BUILD_DIR)/$(strip $(3)); \

        if [ -x configure ]; then \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        if [ -x configure ]; then \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -344,7 +337,7 @@ else
   $(PACKAGE_DIR):
        mkdir -p $@
                
   $(PACKAGE_DIR):
        mkdir -p $@
                

-  ifneq ($(strip $(PKG_SOURCE)),)
+  ifneq ($(strip $(PKG_SOURCE_URL)),)

     download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):
     download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):