trivial changes

[15.05/openwrt.git] / target / image / generic / lzma-loader / Makefile

diff --git a/target/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile
index 6cbbd94..e3a98af 100644 (file)
--- a/target/image/generic/lzma-loader/Makefile
+++ b/target/image/generic/lzma-loader/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME := loader
 PKG_VERSION := 0.05
 
-PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)$(LOADER_TYPE)
 
 $(PKG_BUILD_DIR)/.prepared:
        mkdir $(PKG_BUILD_DIR)
@@ -19,8 +19,8 @@ $(PKG_BUILD_DIR)/.prepared:
        touch $@
 
 $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma
-       $(MAKE) -C $(PKG_BUILD_DIR) CC=$(TARGET_CC) \
-               LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) \
+       PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \
                RAMSIZE=$(RAMSIZE) \
                LOADADDR=$(LOADADDR) \
                KERNEL_ENTRY=$(KERNEL_ENTRY) \
@@ -30,12 +30,12 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l
 $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
        $(CP) $< $@
 
-$(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf
+$(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
        $(CP) $< $@
 
 download: 
 prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(KDIR)/loader.elf
+compile: $(KDIR)/loader$(LOADER_TYPE).elf
 install:
 
 clean: