diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-12-09 18:53:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-12-09 18:53:06 +0000 |
| commit | 93575b53a7d72b7208176a07d34b06a6e2598ac7 (patch) | |
| tree | ace2f795f6550ab9b61ba0ebcadc0ce97af8b60a | |
| parent | b0e20c3895e12bde51af29171cc3372f5f2692b7 (diff) | |
| download | master-31e0f0ae-93575b53a7d72b7208176a07d34b06a6e2598ac7.tar.gz master-31e0f0ae-93575b53a7d72b7208176a07d34b06a6e2598ac7.tar.bz2 master-31e0f0ae-93575b53a7d72b7208176a07d34b06a6e2598ac7.zip | |
Use $(CP) instead of $(INSTALL_BIN) for binaries.
Signed-off-by: Andy Boyett <agb-openwrt@padded-cell.net>
SVN-Revision: 9694
| -rw-r--r-- | package/e2fsprogs/Makefile | 8 | ||||
| -rw-r--r-- | package/fuse/Makefile | 2 | ||||
| -rw-r--r-- | package/gdbserver/Makefile | 2 | ||||
| -rw-r--r-- | package/ipsec-tools/Makefile | 8 | ||||
| -rw-r--r-- | package/iptables/Makefile | 8 | ||||
| -rw-r--r-- | package/linux-atm/Makefile | 2 | ||||
| -rw-r--r-- | package/openssl/Makefile | 2 | ||||
| -rw-r--r-- | package/pcmcia-cs/Makefile | 4 | ||||
| -rw-r--r-- | package/shfs/Makefile | 4 | ||||
| -rw-r--r-- | package/udev/Makefile | 12 | ||||
| -rw-r--r-- | package/wireless-tools/Makefile | 2 | ||||
| -rw-r--r-- | target/imagebuilder/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/au1000/image/Makefile | 2 | ||||
| -rw-r--r-- | tools/firmware-utils/Makefile | 2 |
14 files changed, 31 insertions, 31 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 06db69d068..0186191a6d 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -112,8 +112,8 @@ endef define Package/e2fsprogs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/ ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2 ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3 $(INSTALL_DIR) $(1)/usr/lib @@ -132,12 +132,12 @@ endef define Package/tune2fs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ endef define Package/resize2fs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ endef $(eval $(call BuildPackage,e2fsprogs)) diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 2e7f031f5d..2f249223f7 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -126,7 +126,7 @@ endef define Package/fuse-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ endef define Package/libfuse/install diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 4fac7af2df..e8fb2ee94f 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -62,7 +62,7 @@ endef define Package/gdbserver/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/ endef $(eval $(call BuildPackage,gdbserver)) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 86f24c217e..0f24ae12ee 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -72,10 +72,10 @@ define Package/ipsec-tools/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/ endef define Package/ipsec-tools/conffiles diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f76424862a..80646cd667 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -256,7 +256,7 @@ define Package/iptables/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \ @@ -265,12 +265,12 @@ endef define Package/iptables-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ endef define Package/ip6tables/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ @@ -279,7 +279,7 @@ endef define Package/ip6tables-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/ endef define BuildPlugin diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 8b2da5080b..f67294e081 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -81,7 +81,7 @@ endef define Package/atm-tools/install $(INSTALL_DIR) $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/lib/network $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/ endef diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 555099bd07..4a6dcdbe5e 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -137,7 +137,7 @@ define Package/openssl-util/install $(INSTALL_DIR) $(1)/etc/ssl/private chmod 0700 $(1)/etc/ssl/private $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ endef $(eval $(call BuildPackage,libopenssl)) diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index b785f5b6a7..af9c755c1d 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -62,8 +62,8 @@ define Package/pcmcia-cs/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pcmcia-cs)) diff --git a/package/shfs/Makefile b/package/shfs/Makefile index aa24d7e39b..8467bc10f0 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -80,9 +80,9 @@ endef define Package/shfs-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/ $(INSTALL_DIR) $(1)/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/ endef $(eval $(call KernelPackage,shfs)) diff --git a/package/udev/Makefile b/package/udev/Makefile index bde7a61e3d..9fcf9cfdd3 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -52,14 +52,14 @@ define Package/udev/install $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/ install -d -m0775 $(1)/lib/udev install -d -m0775 $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/ install -d -m0775 $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/ install -d -m0775 $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/ endef define Package/udevtrigger/install diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 3e997a176c..e66b2e3a49 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -63,7 +63,7 @@ endef define Package/wireless-tools/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wireless-tools)) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 607b79be0d..f30eb83a7b 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -29,8 +29,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ - $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/ - $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/ + $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/ + $(INSTALL_BIN) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/ $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ rm -rf \ $(PKG_BUILD_DIR)/target/linux/*/patches \ diff --git a/target/linux/au1000/image/Makefile b/target/linux/au1000/image/Makefile index 3013d62660..3cdd83e589 100644 --- a/target/linux/au1000/image/Makefile +++ b/target/linux/au1000/image/Makefile @@ -56,7 +56,7 @@ define Image/Build $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma $(FLASH_FS) $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(1).img - $(CP) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.bin + $(INSTALL_BIN) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.bin $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-flash.srec $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-ram.srec diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index 6a0c223c58..e5537b445b 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -31,7 +31,7 @@ define Build/Compile endef define Build/Install - $(CP) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/ endef $(eval $(call HostBuild)) |