From 475e0d886041b4345585e13f0c04bcb9af0c0c5a Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 1 Feb 2006 23:53:19 +0000
Subject: change cp to $(CP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/target/linux/image/brcm/Makefile             | 20 ++++++--------------
 openwrt/target/linux/image/brcm/lzma-loader/Makefile |  6 +++---
 2 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'openwrt/target/linux/image/brcm')

diff --git a/openwrt/target/linux/image/brcm/Makefile b/openwrt/target/linux/image/brcm/Makefile
index b15e10b41..18bd3265c 100644
--- a/openwrt/target/linux/image/brcm/Makefile
+++ b/openwrt/target/linux/image/brcm/Makefile
@@ -32,7 +32,7 @@ endif
 
 
 $(KDIR)/loader.tmp.gz:
-	cp $(BUILD_DIR)/loader.gz $@
+	$(CP) $(BUILD_DIR)/loader.gz $@
 	echo -ne "\\x00" >> $@
 
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz
@@ -73,19 +73,11 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
 
 # ifeq ($(FS),squashfs)
 # $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
-# 	cp $< $@
+# 	$(CP) $< $@
 # 	echo -ne '\x01' >> $@
 # 	
 # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx
 # endif
-
-ifneq ($(FS),jffs2-8MB)
-$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
-	$(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
-	
-$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
-	$(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-
 $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
 	$(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
 
@@ -120,8 +112,8 @@ endif
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
 install-ib:
 	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
-	cp -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin
+	$(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
-	cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/
-	cp -fpR $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
-	cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
+	$(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/
+	$(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
+	$(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
diff --git a/openwrt/target/linux/image/brcm/lzma-loader/Makefile b/openwrt/target/linux/image/brcm/lzma-loader/Makefile
index 134fdde9d..1d7b6a319 100644
--- a/openwrt/target/linux/image/brcm/lzma-loader/Makefile
+++ b/openwrt/target/linux/image/brcm/lzma-loader/Makefile
@@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir $(PKG_BUILD_DIR)
-	cp -fpR ./src/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 	touch $@
 
 $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared
@@ -17,10 +17,10 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared
 		LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS)
 
 $(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz
-	cp $< $@
+	$(CP) $< $@
 
 $(BUILD_DIR)/loader.elf: $(PKG_BUILD_DIR)/loader.o
-	cp $< $@
+	$(CP) $< $@
 
 source: 
 prepare: $(PKG_BUILD_DIR)/.prepared
-- 
cgit v1.2.3