From 13fb59dd0549e4f09ae3600298eda16396cb95f1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 9 Dec 2007 18:59:01 +0000 Subject: [PATCH] packages: Use $(CP) instead of $(INSTALL_BIN) for binaries. Signed-off-by: Andy Boyett SVN-Revision: 9695 --- XOrg/app/eterm/Makefile | 4 +-- XOrg/app/fluxbox/Makefile | 8 ++--- XOrg/app/xcalc/Makefile | 2 +- XOrg/app/xclipboard/Makefile | 2 +- XOrg/app/xdm/Makefile | 2 +- XOrg/app/xeyes/Makefile | 2 +- XOrg/app/xinit/Makefile | 2 +- XOrg/app/xlogo/Makefile | 2 +- XOrg/app/xmessage/Makefile | 2 +- XOrg/app/xset/Makefile | 2 +- XOrg/app/xsetroot/Makefile | 2 +- XOrg/font-native/font-util/Makefile | 2 +- XOrg/lib/libast/Makefile | 2 +- XOrg/server/xorg-server-X11R7.2/Makefile | 4 +-- admin/osiris/Makefile | 2 +- admin/syslog-ng/Makefile | 2 +- admin/zabbix/Makefile | 6 ++-- lang/lua/Makefile | 4 +-- lang/sablevm-sdk/Makefile | 2 +- lang/urbi/Makefile | 2 +- libs/avahi/Makefile | 6 ++-- libs/curl/Makefile | 4 +-- libs/fcgi/Makefile | 2 +- libs/freetype/Makefile | 2 +- libs/gd/Makefile | 2 +- libs/gettext/Makefile | 6 ++-- libs/glib/Makefile | 2 +- libs/gnutls/Makefile | 8 ++--- libs/gsm/Makefile | 2 +- libs/howl/Makefile | 8 ++--- libs/jpeg/Makefile | 2 +- libs/libart/Makefile | 2 +- libs/libaudiofile/Makefile | 2 +- libs/libdnet/Makefile | 4 +-- libs/libgcrypt/Makefile | 2 +- libs/libgpg-error/Makefile | 2 +- libs/libgphoto2/Makefile | 2 +- libs/libmcrypt/Makefile | 2 +- libs/libnet-1.0.x/Makefile | 2 +- libs/libnet-1.1.x/Makefile | 2 +- libs/libol/Makefile | 2 +- libs/libpam/Makefile | 2 +- libs/libpng/Makefile | 2 +- libs/libtasn1/Makefile | 2 +- libs/libtool/Makefile | 4 +-- libs/libusb/Makefile | 2 +- libs/libxml2/Makefile | 2 +- libs/libxslt/Makefile | 6 ++-- libs/mysql/Makefile | 2 +- libs/neon/Makefile | 2 +- libs/net-snmp/Makefile | 4 +-- libs/opencdk/Makefile | 2 +- libs/openldap/Makefile | 2 +- libs/postgresql/Makefile | 4 +-- libs/radiusclient-ng/Makefile | 2 +- libs/rrdtool-1.0.x/Makefile | 4 +-- libs/sqlite2/Makefile | 2 +- libs/sqlite3/Makefile | 2 +- libs/taglib/Makefile | 2 +- libs/uclibc++/Makefile | 4 +-- multimedia/gphoto2/Makefile | 2 +- multimedia/motion/Makefile | 2 +- multimedia/peercast/Makefile | 2 +- net/aircrack-ng/Makefile | 16 +++++----- net/amule/Makefile | 2 +- net/amwall/Makefile | 4 +-- net/apache/Makefile | 4 +-- net/asterisk-1.4.x/Makefile | 4 +-- net/asterisk/Makefile | 4 +-- net/bind/Makefile | 38 ++++++++++++------------ net/bing/Makefile | 2 +- net/bitchx/Makefile | 2 +- net/chillispot/Makefile | 2 +- net/cups/Makefile | 6 ++-- net/dhcp-forwarder/Makefile | 2 +- net/dhcp/Makefile | 4 +-- net/dircproxy/Makefile | 2 +- net/dsniff/Makefile | 2 +- net/ethtool/Makefile | 2 +- net/freeradius/Makefile | 4 +-- net/icecast/Makefile | 2 +- net/ipcad/Makefile | 2 +- net/karma/Makefile | 2 +- net/knock/Makefile | 4 +-- net/l2tpns/Makefile | 2 +- net/lighttpd/Makefile | 2 +- net/maradns/Makefile | 4 +-- net/matrixtunnel/Makefile | 2 +- net/miau/Makefile | 2 +- net/miredo/Makefile | 4 +-- net/mtr/Makefile | 2 +- net/mutella/Makefile | 2 +- net/netstat-nat/Makefile | 2 +- net/nfs-utils/Makefile | 2 +- net/nmap/Makefile | 2 +- net/nodogsplash/Makefile | 2 +- net/opendchub/Makefile | 2 +- net/openssh/Makefile | 16 +++++----- net/openvpn/Makefile | 2 +- net/pptpd/Makefile | 4 +-- net/privoxy/Makefile | 2 +- net/ptunnel/Makefile | 2 +- net/quagga/Makefile | 18 +++++------ net/raddump/Makefile | 2 +- net/radsecproxy/Makefile | 2 +- net/rarpd/Makefile | 2 +- net/reaim/Makefile | 2 +- net/rp-l2tp/Makefile | 6 ++-- net/rp-pppoe/Makefile | 8 ++--- net/rtorrent/Makefile | 2 +- net/scdp/Makefile | 2 +- net/ser2net/Makefile | 2 +- net/shorewall-common/Makefile | 2 +- net/siproxd/Makefile | 2 +- net/sipsak/Makefile | 2 +- net/slurm/Makefile | 2 +- net/socat/Makefile | 2 +- net/squid/Makefile | 2 +- net/stunnel/Makefile | 2 +- net/subversion/Makefile | 4 +-- net/tcpdump/Makefile | 2 +- net/tinc/Makefile | 2 +- net/tinyproxy/Makefile | 2 +- net/tmsnc/Makefile | 2 +- net/tsocks/Makefile | 2 +- net/ulogd/Makefile | 2 +- net/vgp/Makefile | 2 +- net/wccpd/Makefile | 2 +- net/weechat/Makefile | 2 +- net/wifidog/Makefile | 4 +-- net/xinetd/Makefile | 2 +- net/xsupplicant/Makefile | 4 +-- sound/flite/Makefile | 2 +- sound/lame/Makefile | 2 +- sound/madplay/Makefile | 2 +- sound/mpd/Makefile | 2 +- sound/mt-daapd/Makefile | 2 +- sound/streamripper/Makefile | 4 +-- utils/alsa-utils/Makefile | 6 ++-- utils/bash/Makefile | 2 +- utils/binutils/Makefile | 2 +- utils/bluez-hcidump/Makefile | 2 +- utils/bluez-utils/Makefile | 4 +-- utils/dbus/Makefile | 4 +-- utils/dosfstools/Makefile | 8 ++--- utils/fetchmail/Makefile | 2 +- utils/gnokii/Makefile | 6 ++-- utils/lrzsz/Makefile | 4 +-- utils/macchanger/Makefile | 2 +- utils/nano/Makefile | 2 +- utils/ntfs-3g/Makefile | 2 +- utils/reiserfsprogs/Makefile | 10 +++---- utils/rrdcollect/Makefile | 2 +- utils/rrdtool/Makefile | 6 ++-- utils/sane-backends/Makefile | 2 +- utils/unzip/Makefile | 2 +- utils/valgrind/Makefile | 2 +- utils/zip/Makefile | 2 +- 158 files changed, 262 insertions(+), 262 deletions(-) diff --git a/XOrg/app/eterm/Makefile b/XOrg/app/eterm/Makefile index e7ff174ddc..86e0d0000d 100644 --- a/XOrg/app/eterm/Makefile +++ b/XOrg/app/eterm/Makefile @@ -57,12 +57,12 @@ endef define Package/eterm/install $(INSTALL_DIR) $(1)/usr/{bin,lib} $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/bin/Eterm $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Eterm $(1)/usr/bin endef define Package/esetroot/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/Esetroot $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Esetroot $(1)/usr/bin endef $(eval $(call BuildPackage,esetroot)) diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile index d9e0942506..aca787d956 100644 --- a/XOrg/app/fluxbox/Makefile +++ b/XOrg/app/fluxbox/Makefile @@ -62,7 +62,7 @@ endef define Package/fluxbox/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/ $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/ $(CP) files/menu $(1)/usr/share/fluxbox/ @@ -70,17 +70,17 @@ endef define Package/fbsetbg/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/ endef define Package/fbsetroot/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/ endef define Package/fbrun/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/ endef $(eval $(call BuildPackage,fbrun)) diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile index e0a541b101..121ef4d1de 100644 --- a/XOrg/app/xcalc/Makefile +++ b/XOrg/app/xcalc/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile index c3a61e340d..18bc8b4ec0 100644 --- a/XOrg/app/xclipboard/Makefile +++ b/XOrg/app/xclipboard/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile index 4e04df9472..61a603f10d 100644 --- a/XOrg/app/xdm/Makefile +++ b/XOrg/app/xdm/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile index 561f0d3a6f..4aeb787ca1 100644 --- a/XOrg/app/xeyes/Makefile +++ b/XOrg/app/xeyes/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile index 6d7250a6db..b0ce6392f8 100644 --- a/XOrg/app/xinit/Makefile +++ b/XOrg/app/xinit/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile index 11644740f4..6b78dd0889 100644 --- a/XOrg/app/xlogo/Makefile +++ b/XOrg/app/xlogo/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile index 7e133b3ed3..d34f2a185d 100644 --- a/XOrg/app/xmessage/Makefile +++ b/XOrg/app/xmessage/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile index 0f661cff38..8538210f03 100644 --- a/XOrg/app/xset/Makefile +++ b/XOrg/app/xset/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile index 4a036440a8..e8b8b4e68b 100644 --- a/XOrg/app/xsetroot/Makefile +++ b/XOrg/app/xsetroot/Makefile @@ -67,7 +67,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile index ed06305448..9873843857 100644 --- a/XOrg/font-native/font-util/Makefile +++ b/XOrg/font-native/font-util/Makefile @@ -37,7 +37,7 @@ endef define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/ - $(CP) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,font-util)) diff --git a/XOrg/lib/libast/Makefile b/XOrg/lib/libast/Makefile index 730a6a9acf..ce0046889e 100644 --- a/XOrg/lib/libast/Makefile +++ b/XOrg/lib/libast/Makefile @@ -50,7 +50,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib,include,bin} $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*{la,so}* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libast*.la $(SED) "s,-I/usr/include,,g" $(1)/usr/bin/libast-config diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index a7e89971bb..b089acc8be 100644 --- a/XOrg/server/xorg-server-X11R7.2/Makefile +++ b/XOrg/server/xorg-server-X11R7.2/Makefile @@ -138,7 +138,7 @@ endef define Package/xorg-server/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/ cd $(1)/usr/bin; ln -s Xorg X $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ @@ -157,7 +157,7 @@ endef define Packages/xorg-server-config/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/ endef define Build/InstallDev diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 059b4f4b42..7bd18037d5 100644 --- a/admin/osiris/Makefile +++ b/admin/osiris/Makefile @@ -39,7 +39,7 @@ MAKE_FLAGS += \ define Package/osirisd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd endef diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 2357da5865..895d76118f 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -51,7 +51,7 @@ endef define Package/syslog-ng/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng $(INSTALL_DIR) $(1)/etc/syslog-ng diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 9d54795b75..66dca10f01 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -77,14 +77,14 @@ endef define Package/zabbix-agent/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_agentd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_agentd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/zabbix $(INSTALL_CONF) $(PKG_BUILD_DIR)/misc/conf/zabbix_agentd.conf $(1)/etc/zabbix/ endef define Package/zabbix-sender/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_sender $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_sender $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/zabbix endef @@ -94,7 +94,7 @@ endef define Package/zabbix-server/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_server $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_server $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/zabbix $(INSTALL_CONF) $(PKG_BUILD_DIR)/misc/conf/zabbix_server.conf $(1)/etc/zabbix/ endef diff --git a/lang/lua/Makefile b/lang/lua/Makefile index bbb175e26b..2365762780 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -131,12 +131,12 @@ endef define Package/lua/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/ endef define Package/luac/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/ endef define Package/lua-examples/install diff --git a/lang/sablevm-sdk/Makefile b/lang/sablevm-sdk/Makefile index 6760a50fe4..75a65c7308 100644 --- a/lang/sablevm-sdk/Makefile +++ b/lang/sablevm-sdk/Makefile @@ -104,7 +104,7 @@ endef define Package/sablevm/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/sablevm-classpath diff --git a/lang/urbi/Makefile b/lang/urbi/Makefile index e3fa9f2279..929d3da4d0 100644 --- a/lang/urbi/Makefile +++ b/lang/urbi/Makefile @@ -59,7 +59,7 @@ define Package/urbi/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/gostai $(CP) $(PKG_INSTALL_DIR)/usr/gostai/* $(1)/usr/gostai/ endef diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index 3d22f47514..b601d90501 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -173,12 +173,12 @@ define Package/avahi-autoipd/install $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/ endef define Package/avahi-daemon/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/avahi $(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/ $(INSTALL_DIR) $(1)/etc/avahi/services @@ -192,7 +192,7 @@ define Package/avahi-dnsconfd/install $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libavahi)) diff --git a/libs/curl/Makefile b/libs/curl/Makefile index 57ddeb0f63..bd4fea52b7 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -84,7 +84,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/ mkdir -p $(1)/usr/lib @@ -104,7 +104,7 @@ endef define Package/curl/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/ endef define Package/libcurl/install diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile index c76ba2554f..9bf5bbbd6d 100644 --- a/libs/fcgi/Makefile +++ b/libs/fcgi/Makefile @@ -68,7 +68,7 @@ endef define Package/fcgi/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/ endef diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index 88ddbf3c52..46fb0f6809 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -50,7 +50,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(1)/usr/include/ diff --git a/libs/gd/Makefile b/libs/gd/Makefile index db2f004b82..1c4a130fe7 100644 --- a/libs/gd/Makefile +++ b/libs/gd/Makefile @@ -52,7 +52,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \ diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile index 36deebf627..bd9a330dce 100644 --- a/libs/gettext/Makefile +++ b/libs/gettext/Makefile @@ -51,9 +51,9 @@ endef define Build/InstallDev mkdir -p $(1)/usr/lib/libintl/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/ mkdir -p $(1)/usr/lib/libintl/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/ endef define Build/UninstallDev @@ -62,7 +62,7 @@ endef define Package/libintl/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libintl)) diff --git a/libs/glib/Makefile b/libs/glib/Makefile index 5a22072678..2a3dbc33f2 100644 --- a/libs/glib/Makefile +++ b/libs/glib/Makefile @@ -67,7 +67,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(1)/usr/include/ $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/ diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 0154a58129..1941d95d23 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -151,7 +151,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/ mkdir -p $(1)/usr/lib @@ -176,14 +176,14 @@ define Package/certtool/install $(INSTALL_DIR) $(1)/etc/gnutls $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/ endef define Package/gnutls-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/ endef diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile index 759d81e54c..a4ec98625c 100644 --- a/libs/gsm/Makefile +++ b/libs/gsm/Makefile @@ -73,7 +73,7 @@ endef define Package/gsm-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef define Build/InstallDev diff --git a/libs/howl/Makefile b/libs/howl/Makefile index 587e8b2ac8..4be30c9686 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -123,14 +123,14 @@ endef define Package/howl-autoipd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DATA) ./files/autoipd.init $(1)/etc/init.d/autoipd endef define Package/howl-mdnsresponder/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/mDNSResponder.conf $(1)/etc/mDNSResponder.conf $(INSTALL_DIR) $(1)/etc/init.d @@ -139,14 +139,14 @@ endef define Package/howl-nifd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DATA) ./files/nifd.init $(1)/etc/init.d/nifd endef define Package/howl-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(1)/usr/bin/ endef $(eval $(call BuildPackage,libhowl)) diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile index 1ec7c6736f..a529b8ba54 100644 --- a/libs/jpeg/Makefile +++ b/libs/jpeg/Makefile @@ -92,7 +92,7 @@ endef define Package/jpeg-tools/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/ endef $(eval $(call BuildPackage,libjpeg)) diff --git a/libs/libart/Makefile b/libs/libart/Makefile index 0dd194aff5..b3d5cc1095 100644 --- a/libs/libart/Makefile +++ b/libs/libart/Makefile @@ -52,7 +52,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile index c6583f9140..3b5a2c27c6 100644 --- a/libs/libaudiofile/Makefile +++ b/libs/libaudiofile/Makefile @@ -50,7 +50,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(1)/usr/include/ diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 368a5a2ebb..184b8fb6e4 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -61,7 +61,7 @@ MAKE_FLAGS += \ define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(1)/usr/include/ @@ -81,7 +81,7 @@ define Package/libdnet/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/ endef define Package/pydnet/install diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 8350971e70..00a69afbcf 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -55,7 +55,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 3c78a42be6..a2d9d90b34 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -55,7 +55,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index fd1eba0dab..0883759142 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -70,7 +70,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/gphoto2 $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index 2fab426c11..8ed6475e2a 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -52,7 +52,7 @@ define Build/InstallDev mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/ $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config endef diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile index e1ae54adc9..73044d224b 100644 --- a/libs/libnet-1.0.x/Makefile +++ b/libs/libnet-1.0.x/Makefile @@ -65,7 +65,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/lib/libnet-1.0.x/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/ mkdir -p $(1)/usr/lib/libnet-1.0.x/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/ mkdir -p $(1)/usr/lib/libnet-1.0.x/lib diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile index 085b044f2f..1978fe1b20 100644 --- a/libs/libnet-1.1.x/Makefile +++ b/libs/libnet-1.1.x/Makefile @@ -65,7 +65,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/lib/libnet-1.1.x/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/ mkdir -p $(1)/usr/lib/libnet-1.1.x/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/ mkdir -p $(1)/usr/lib/libnet-1.1.x/lib diff --git a/libs/libol/Makefile b/libs/libol/Makefile index 3d2e43fcbc..506b34a3b2 100644 --- a/libs/libol/Makefile +++ b/libs/libol/Makefile @@ -45,7 +45,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libol $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile index 318dd9b331..a0350847f0 100644 --- a/libs/libpam/Makefile +++ b/libs/libpam/Makefile @@ -72,7 +72,7 @@ define Package/libpam/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/* $(1)/lib/ $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libpam)) diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index b2cbe4f002..942d5fe94c 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -45,7 +45,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(1)/usr/include/ diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index d4af9a5f90..1c1fb78819 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -50,7 +50,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile index 78b07f8e6a..29f25261fa 100644 --- a/libs/libtool/Makefile +++ b/libs/libtool/Makefile @@ -51,8 +51,8 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtool $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/ mkdir -p $(1)/usr/share/ $(CP) -R $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ mkdir -p $(1)/usr/include diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index 40a09fe137..dfc74ad888 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -43,7 +43,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index e0d9cf4e77..964af60f67 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -81,7 +81,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 4cdd73eeb9..917d78f712 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -71,8 +71,8 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(1)/usr/include/ mkdir -p $(1)/usr/lib @@ -100,7 +100,7 @@ endef define Package/xsltproc/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/ endef $(eval $(call BuildPackage,libxslt)) diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index 3ceeaff715..ba138dd3c6 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -95,7 +95,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/ # NOTE: needed for MySQL-Python diff --git a/libs/neon/Makefile b/libs/neon/Makefile index 473c48238c..e3a835ccd4 100644 --- a/libs/neon/Makefile +++ b/libs/neon/Makefile @@ -51,7 +51,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/neon $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index 598487a69f..1aa8fd114f 100644 --- a/libs/net-snmp/Makefile +++ b/libs/net-snmp/Makefile @@ -182,7 +182,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(1)/usr/include/ mkdir -p $(1)/usr/lib @@ -236,7 +236,7 @@ endef define Package/snmp-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ endef $(eval $(call BuildPackage,libnetsnmp)) diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile index e104417c4c..dd396e1da9 100644 --- a/libs/opencdk/Makefile +++ b/libs/opencdk/Makefile @@ -57,7 +57,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 20421c24b0..06c526d8e5 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -112,7 +112,7 @@ endef define Package/openldap-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ endef $(eval $(call BuildPackage,libopenldap)) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 804c510215..88692579a0 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -170,7 +170,7 @@ endef define Package/pgsql-cli/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/psql $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psql $(1)/usr/bin/ endef define Package/pgsql-server/install @@ -252,7 +252,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/ diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile index 487d6e36fd..783a67edf1 100644 --- a/libs/radiusclient-ng/Makefile +++ b/libs/radiusclient-ng/Makefile @@ -98,7 +98,7 @@ endef define Package/radiusclient-ng/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libradiusclient-ng)) diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile index 25c882e6fe..3664200b36 100644 --- a/libs/rrdtool-1.0.x/Makefile +++ b/libs/rrdtool-1.0.x/Makefile @@ -145,12 +145,12 @@ endef define Package/rrdtool1/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/ endef define Package/rrdcgi1/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ endef define Package/librrd1/install diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile index aa8bae9568..43f138b6d0 100644 --- a/libs/sqlite2/Makefile +++ b/libs/sqlite2/Makefile @@ -103,7 +103,7 @@ endef define Package/sqlite2-cli/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/ endef $(eval $(call BuildPackage,libsqlite2)) diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index a39f73623f..1706ac0508 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -102,7 +102,7 @@ endef define Package/sqlite3-cli/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/ endef $(eval $(call BuildPackage,libsqlite3)) diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index c354408a57..eeb70b4fa8 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -45,7 +45,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/taglib-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/taglib-config $(1)/usr/bin/ mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/include/taglib diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 8a321f4538..fcfd48b42a 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -65,7 +65,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(1)/usr/bin/ mkdir -p $(1)/usr/include/uClibc++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/ mkdir -p $(1)/usr/lib @@ -73,7 +73,7 @@ define Build/InstallDev $(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(1)/usr/bin/g++-uc $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(1)/usr/bin/g++-uc # add another wrapper which links against both uClibc++ and libstdc++ - $(CP) $(1)/usr/bin/g++-uc $(1)/usr/bin/g++-uc+std + $(INSTALL_BIN) $(1)/usr/bin/g++-uc $(1)/usr/bin/g++-uc+std $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(1)/usr/bin/g++-uc+std $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(1)/usr/bin/g++-uc+std $(SED) 's|-nostdinc++||g' $(1)/usr/bin/g++-uc+std diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index 38f9443190..4e1a3dca63 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -55,7 +55,7 @@ endef define Package/gphoto2/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gphoto2 $(1)/usr/bin/ endef diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 220c760dd9..7b46573aec 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -53,7 +53,7 @@ define Package/motion/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ endef diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile index 1eb99d1114..10a12d5c58 100644 --- a/multimedia/peercast/Makefile +++ b/multimedia/peercast/Makefile @@ -53,7 +53,7 @@ endef define Package/peercast/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/share/peercast/html $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/ $(INSTALL_DIR) $(1)/etc diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile index 8ab3141633..08e32d09e0 100644 --- a/net/aircrack-ng/Makefile +++ b/net/aircrack-ng/Makefile @@ -50,15 +50,15 @@ endef define Package/aircrack-ng/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/aircrack-ng $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/airdecap-ng $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/packetforge-ng $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ivstools $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/kstats $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aircrack-ng $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/airdecap-ng $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/packetforge-ng $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ivstools $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kstats $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/aireplay-ng $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/airodump-ng $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/airmon-ng $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/aireplay-ng $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/airodump-ng $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/airmon-ng $(1)/usr/sbin/ endef $(eval $(call BuildPackage,aircrack-ng)) diff --git a/net/amule/Makefile b/net/amule/Makefile index f9ac207041..1341838431 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -77,7 +77,7 @@ endef define Package/amule/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/amule{cmd,d,web} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amule{cmd,d,web} $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/amule $(1)/usr/share/ endef diff --git a/net/amwall/Makefile b/net/amwall/Makefile index 583d6ee32d..f128f26a15 100644 --- a/net/amwall/Makefile +++ b/net/amwall/Makefile @@ -48,9 +48,9 @@ endef define Package/amwall/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/amsel $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/ endef diff --git a/net/apache/Makefile b/net/apache/Makefile index 9d9282fc7c..438c8eee4d 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -140,11 +140,11 @@ endef define Package/apache-server/install $(INSTALL_DIR) $(1)/usr/sbin # we don't need apxs on the router, it's just for building apache modules. - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/httpd.exp $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/share - $(CP) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/ $(INSTALL_DIR) $(1)/etc/apache $(CP) $(PKG_INSTALL_DIR)/etc/apache/{magic,mime.types,extra} $(1)/etc/apache/ $(CP) ./files/etc/apache/httpd.conf $(1)/etc/apache/ diff --git a/net/asterisk-1.4.x/Makefile b/net/asterisk-1.4.x/Makefile index d255ac9c53..11e55b4408 100644 --- a/net/asterisk-1.4.x/Makefile +++ b/net/asterisk-1.4.x/Makefile @@ -541,8 +541,8 @@ define Package/asterisk14-mini/install $(INSTALL_DIR) $(1)/usr/lib/asterisk/moh $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/default $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 40f19946cf..d40e63dbde 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -486,8 +486,8 @@ define Package/asterisk-mini/install $(INSTALL_DIR) $(1)/usr/lib/asterisk/mohmp3 $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/default $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/bind/Makefile b/net/bind/Makefile index a0b2a341dc..fbd623d426 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -117,9 +117,9 @@ endef define Package/bind-server/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc - $(CP) ./files/bind $(1)/etc/ + $(INSTALL_BIN) ./files/bind $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(CP) ./files/named.init $(1)/etc/init.d/named find $(1)/etc/bind/ -name ".svn" | xargs rm -rf @@ -127,48 +127,48 @@ endef define Package/bind-client/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/ endef define Package/bind-tools/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/ endef define Package/bind-rndc/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/ endef define Package/bind-check/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/ endef define Package/bind-dnssec/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ endef define Package/bind-host/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ endef define Package/bind-dig/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ endef $(eval $(call BuildPackage,bind-libs)) diff --git a/net/bing/Makefile b/net/bing/Makefile index 8b328ca633..271040b375 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -38,7 +38,7 @@ endef define Package/bing/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/bing $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bing $(1)/usr/sbin/ endef $(eval $(call BuildPackage,bing)) diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile index 56a7bba0b4..3e44b59e5e 100644 --- a/net/bitchx/Makefile +++ b/net/bitchx/Makefile @@ -65,7 +65,7 @@ endef define Package/bitchx/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/ $(CP) $(PKG_INSTALL_DIR)/tmp/.bitchxrc $(1)/tmp diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile index ee678a4dc2..e4d2a98f20 100644 --- a/net/chillispot/Makefile +++ b/net/chillispot/Makefile @@ -58,7 +58,7 @@ define Package/chillispot/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/ endef $(eval $(call BuildPackage,chillispot)) diff --git a/net/cups/Makefile b/net/cups/Makefile index ff6a45bcb1..ee72d5dba7 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -82,7 +82,7 @@ define Package/cups/install rm -rf $(1)/etc/cups/certs ln -sf /tmp $(1)/etc/cups/certs $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ rm -f $(1)/usr/bin/cups-config $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(1)/usr/lib/ @@ -93,7 +93,7 @@ define Package/cups/install $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(1)/usr/share/doc/cups/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ # overwrite default config with our own $(CP) ./files/etc/cups/* $(1)/etc/cups/ # install initscript with priority 60 @@ -103,7 +103,7 @@ endef define Build/InstallDev mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(1)/usr/bin/ mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ mkdir -p $(1)/usr/lib diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile index 13eaa409f3..24f68d04bf 100644 --- a/net/dhcp-forwarder/Makefile +++ b/net/dhcp-forwarder/Makefile @@ -46,7 +46,7 @@ endef define Package/dhcp-forwarder/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile index a38f2707f0..c9699932bf 100644 --- a/net/dhcp/Makefile +++ b/net/dhcp/Makefile @@ -64,12 +64,12 @@ endef define Package/dhcp-relay/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin/ endef define Package/dhcp-server/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dhcpd.init $(1)/etc/init.d/dhcpd endef diff --git a/net/dircproxy/Makefile b/net/dircproxy/Makefile index cf694b6637..41e1bcd448 100644 --- a/net/dircproxy/Makefile +++ b/net/dircproxy/Makefile @@ -39,7 +39,7 @@ endef define Package/dircproxy/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/ endef $(eval $(call BuildPackage,dircproxy)) diff --git a/net/dsniff/Makefile b/net/dsniff/Makefile index be2dbb14b0..a4bb626e14 100644 --- a/net/dsniff/Makefile +++ b/net/dsniff/Makefile @@ -54,7 +54,7 @@ endef define Package/dsniff/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 3c909734a5..c9e023e02e 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -42,7 +42,7 @@ endef define Package/ethtool/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ethtool $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ethtool $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ethtool)) diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index a5896887c8..ecdb2baa7f 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -346,7 +346,7 @@ define Package/freeradius/install $(INSTALL_DIR) $(1)/usr/lib/freeradius $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd endef @@ -363,7 +363,7 @@ endef define Package/freeradius-utils/install $(INSTALL_DIR) $(1)/usr/bin for f in radclient radeapclient; do \ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \ done endef diff --git a/net/icecast/Makefile b/net/icecast/Makefile index 59121a6ad2..2511afcaed 100644 --- a/net/icecast/Makefile +++ b/net/icecast/Makefile @@ -65,7 +65,7 @@ define Package/icecast/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share/icecast $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(1)/usr/share/icecast/ $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/ diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile index e38a3a9556..55a4e9fcb5 100644 --- a/net/ipcad/Makefile +++ b/net/ipcad/Makefile @@ -66,7 +66,7 @@ define Package/ipcad/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ipcad $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipcad $(1)/usr/bin/ endef $(eval $(call BuildPackage,ipcad)) diff --git a/net/karma/Makefile b/net/karma/Makefile index f5608e8544..650f28e448 100644 --- a/net/karma/Makefile +++ b/net/karma/Makefile @@ -51,7 +51,7 @@ endef define Package/karma/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/bin/karma $(1)/usr/sbin/karma-ruby + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/karma $(1)/usr/sbin/karma-ruby $(CP) $(PKG_BUILD_DIR)/src/karma $(1)/usr/sbin/karma $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/ diff --git a/net/knock/Makefile b/net/knock/Makefile index d331e98402..d9fbbe6bac 100644 --- a/net/knock/Makefile +++ b/net/knock/Makefile @@ -87,14 +87,14 @@ endef define Package/knock/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/knock $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knock $(1)/usr/bin/ endef define Package/knockd/install $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knockd.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,knock)) diff --git a/net/l2tpns/Makefile b/net/l2tpns/Makefile index 59db04978f..cbe09254b3 100644 --- a/net/l2tpns/Makefile +++ b/net/l2tpns/Makefile @@ -59,7 +59,7 @@ define Package/l2tpns/install $(INSTALL_DIR) $(1)/usr/lib/l2tpns $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(1)/usr/lib/l2tpns/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ endef $(eval $(call BuildPackage,l2tpns)) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 95e4ed65cc..113b57d427 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -180,7 +180,7 @@ define Package/lighttpd/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \ done $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/ endef define BuildPlugin diff --git a/net/maradns/Makefile b/net/maradns/Makefile index f474b79864..81f83c7356 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -64,9 +64,9 @@ define Package/maradns/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/maradns.init $(1)/etc/init.d/maradns $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,maradns)) diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile index e71d4ca3b0..cbcf18cf0f 100644 --- a/net/matrixtunnel/Makefile +++ b/net/matrixtunnel/Makefile @@ -50,7 +50,7 @@ endef define Package/matrixtunnel/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/ endef $(eval $(call BuildPackage,matrixtunnel)) diff --git a/net/miau/Makefile b/net/miau/Makefile index f884eefeac..376f813b17 100644 --- a/net/miau/Makefile +++ b/net/miau/Makefile @@ -49,7 +49,7 @@ MAKE_FLAGS += \ define Package/miau/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/default $(INSTALL_DIR) $(1)/etc/miau diff --git a/net/miredo/Makefile b/net/miredo/Makefile index e7782dbb0b..9753fd6074 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -74,7 +74,7 @@ define Package/miredo-server/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/ endef define Package/miredo-client/install @@ -83,7 +83,7 @@ define Package/miredo-client/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/ endef $(eval $(call BuildPackage,miredo-server)) diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 912cee5854..9da915ed4e 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -65,7 +65,7 @@ endef define Package/mtr/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/ endef $(eval $(call BuildPackage,mtr)) diff --git a/net/mutella/Makefile b/net/mutella/Makefile index bc3f45233b..76e5b33763 100644 --- a/net/mutella/Makefile +++ b/net/mutella/Makefile @@ -61,7 +61,7 @@ endef define Package/mutella/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mutella{,_sio} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutella{,_sio} $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/mutella $(1)/usr/share/ endef diff --git a/net/netstat-nat/Makefile b/net/netstat-nat/Makefile index 6e89d90f29..76d8ca71b4 100644 --- a/net/netstat-nat/Makefile +++ b/net/netstat-nat/Makefile @@ -46,7 +46,7 @@ endef define Package/netstat-nat/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(1)/usr/bin/ endef $(eval $(call BuildPackage,netstat-nat)) diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile index 753c402e5e..7fd9e729f3 100644 --- a/net/nfs-utils/Makefile +++ b/net/nfs-utils/Makefile @@ -49,7 +49,7 @@ endef define Package/nfs-utils/install $(INSTALL_DIR) $(1)/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/mount* $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount* $(1)/sbin/ endef $(eval $(call BuildPackage,nfs-utils)) diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 5299724e6a..f1926eae6a 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -50,7 +50,7 @@ endef define Package/nmap/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share/nmap for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \ $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$$$file $(1)/usr/share/nmap/ ; \ diff --git a/net/nodogsplash/Makefile b/net/nodogsplash/Makefile index 5d6f7c623b..e3c364ac55 100644 --- a/net/nodogsplash/Makefile +++ b/net/nodogsplash/Makefile @@ -54,7 +54,7 @@ endef define Package/nodogsplash/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef diff --git a/net/opendchub/Makefile b/net/opendchub/Makefile index 683f7e8cce..2ae0e4d72c 100644 --- a/net/opendchub/Makefile +++ b/net/opendchub/Makefile @@ -50,7 +50,7 @@ endef define Package/opendchub/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/opendchub $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opendchub $(1)/usr/bin/ endef $(eval $(call BuildPackage,opendchub)) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 2a2057a54f..ec55e6b894 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -160,15 +160,15 @@ define Package/openssh-client/install chmod 0700 $(1)/etc/ssh $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/ endef define Package/openssh-client-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/ endef define Package/openssh-server/install @@ -178,9 +178,9 @@ define Package/openssh-server/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/ endef define Package/openssh-server/postinst @@ -225,7 +225,7 @@ endef define Package/openssh-sftp-client/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/ endef define Package/openssh-sftp-server/install diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 31da38a189..d2fdabe7cf 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -59,7 +59,7 @@ endef define Package/openvpn/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d/ $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) $(INSTALL_DIR) $(1)/etc/default diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile index 2070acc0c8..bd6b56eed3 100644 --- a/net/pptpd/Makefile +++ b/net/pptpd/Makefile @@ -47,8 +47,8 @@ endef define Package/pptpd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/pptpd $(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd $(INSTALL_DIR) $(1)/etc diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index 81aca64a40..5b45f52e09 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -63,7 +63,7 @@ endef define Package/privoxy/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/privoxy $(CP) $(PKG_INSTALL_DIR)/etc/privoxy/* $(1)/etc/privoxy/ $(INSTALL_CONF) ./files/privoxy.config $(1)/etc/privoxy/config diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile index 1811fa222f..39dc30a3f3 100644 --- a/net/ptunnel/Makefile +++ b/net/ptunnel/Makefile @@ -46,7 +46,7 @@ endef define Package/ptunnel/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ptunnel)) diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 56d0560e55..156de977c5 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -125,8 +125,8 @@ endef define Package/quagga/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/ # avoid /etc being set to 0750 $(INSTALL_DIR) $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga/ @@ -186,37 +186,37 @@ endef define Package/quagga-bgpd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/ endef define Package/quagga-isisd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin endef define Package/quagga-ospfd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/ endef define Package/quagga-ospf6d/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/ endef define Package/quagga-ripd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/ endef define Package/quagga-ripngd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/ endef define Package/quagga-vtysh/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/ endef define Package/quagga-libospf/install diff --git a/net/raddump/Makefile b/net/raddump/Makefile index e53042403f..cf6423ca2f 100644 --- a/net/raddump/Makefile +++ b/net/raddump/Makefile @@ -46,7 +46,7 @@ endef define Package/raddump/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/ endef $(eval $(call BuildPackage,raddump)) diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile index f6e4e89cdd..32c733887d 100644 --- a/net/radsecproxy/Makefile +++ b/net/radsecproxy/Makefile @@ -45,7 +45,7 @@ endef define Package/radsecproxy/install $(INSTALL_DIR) $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/ $(CP) $(PKG_INSTALL_DIR)/etc/radsecproxy.conf-example $(1)/etc/radsecproxy.conf $(INSTALL_DIR) $(1)/etc/init.d/ diff --git a/net/rarpd/Makefile b/net/rarpd/Makefile index 0544bfc188..941c5d9ed5 100644 --- a/net/rarpd/Makefile +++ b/net/rarpd/Makefile @@ -54,7 +54,7 @@ endef define Package/rarpd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/default install -m644 ./files/rarpd.default $(1)/etc/default/rarpd $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/reaim/Makefile b/net/reaim/Makefile index f72eb5a78e..219a61a0e6 100644 --- a/net/reaim/Makefile +++ b/net/reaim/Makefile @@ -44,7 +44,7 @@ endef define Package/reaim/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/reaim.init $(1)/etc/init.d/reaim endef diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile index 6c77c4934f..1748a447cf 100644 --- a/net/rp-l2tp/Makefile +++ b/net/rp-l2tp/Makefile @@ -46,19 +46,19 @@ define Package/rp-l2tpd/install $(CP) $(PKG_INSTALL_DIR)/etc/l2tp.conf.example $(1)/etc/l2tp.conf $(INSTALL_DIR) $(1)/usr/lib/l2tp $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/cmd.so $(1)/usr/lib/l2tp/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/sync-pppd.so $(1)/usr/lib/l2tp/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/ endef #define Package/rp-l2tpd-mod-cmd/install # $(INSTALL_DIR) $(1)/usr/lib/l2tp # $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/cmd.so $(1)/usr/lib/l2tp/ # $(INSTALL_DIR) $(1)/usr/sbin -# $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/ +# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/ #endef #define Package/rp-l2tpd-mod-ppp/install diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 67dc23fbbb..2300492c30 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -62,7 +62,7 @@ define Package/rp-pppoe-client/install $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe.conf $(1)/etc/ppp/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/scripts/pppoe-{connect,start,stop} $(1)/usr/sbin/ $(SED) 's,modprobe,insmod,g' $(1)/usr/sbin/pppoe-connect endef @@ -73,7 +73,7 @@ define Package/rp-pppoe-relay/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/ endef define Package/rp-pppoe-server/install @@ -84,12 +84,12 @@ define Package/rp-pppoe-server/install $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/ endef define Package/rp-pppoe-sniff/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/ endef $(eval $(call BuildPackage,rp-pppoe-client)) diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 2a48fec36a..50c6e9729e 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -62,7 +62,7 @@ endef define Package/rtorrent/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/ endef $(eval $(call BuildPackage,rtorrent)) diff --git a/net/scdp/Makefile b/net/scdp/Makefile index 9ab08d53d0..f502080204 100644 --- a/net/scdp/Makefile +++ b/net/scdp/Makefile @@ -52,7 +52,7 @@ endef define Package/scdp/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/ endef $(eval $(call BuildPackage,scdp)) diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile index b74bbe4dbe..ae07968975 100644 --- a/net/ser2net/Makefile +++ b/net/ser2net/Makefile @@ -49,7 +49,7 @@ endef define Package/ser2net/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/ endef diff --git a/net/shorewall-common/Makefile b/net/shorewall-common/Makefile index 4640c250b6..02fdfb8c0d 100644 --- a/net/shorewall-common/Makefile +++ b/net/shorewall-common/Makefile @@ -44,7 +44,7 @@ define Package/shorewall-common/install $(INSTALL_DIR) $(1)/bin $(INSTALL_BIN) ./files/shorewall.init $(1)/etc/init.d/shorewall $(INSTALL_BIN) ./files/hostname $(1)/bin - $(CP) $(PKG_INSTALL_DIR)/sbin/shorewall $(1)/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall $(1)/sbin $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/etc/shorewall $(1)/etc endef diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index 9426f99405..de78300fa2 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -44,7 +44,7 @@ endef define Package/siproxd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/ diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index f35351c280..2339c57bbf 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -44,7 +44,7 @@ endef define Package/sipsak/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(1)/usr/bin/ endef $(eval $(call BuildPackage,sipsak)) diff --git a/net/slurm/Makefile b/net/slurm/Makefile index abeb1062d6..6ba417aaf8 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -61,7 +61,7 @@ endef define Package/slurm/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/slurm $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/slurm $(1)/usr/bin/ endef $(eval $(call BuildPackage,slurm)) diff --git a/net/socat/Makefile b/net/socat/Makefile index f805a7e8e9..227464831d 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -57,7 +57,7 @@ endef define Package/socat/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/ endef $(eval $(call BuildPackage,socat)) diff --git a/net/squid/Makefile b/net/squid/Makefile index 9bf79b8cf0..b0b4d25213 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -162,7 +162,7 @@ define Package/squid/install $(INSTALL_DIR) $(1)/usr/share/squid $(CP) $(PKG_INSTALL_DIR)/usr/share/squid/* $(1)/usr/share/squid/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/squid $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger} $(1)/usr/lib/squid/ endef diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 36c7391008..49fed854db 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -46,7 +46,7 @@ endef define Package/stunnel/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib $(1)/usr/stunnel $(INSTALL_DIR) $(1)/etc/stunnel $(1)/etc/init.d - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/stunnel $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/stunnel $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libstunnel.so $(1)/usr/sbin/ $(CP) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf $(CP) ./files/stunnel.init $(1)/etc/init.d/S90stunnel diff --git a/net/subversion/Makefile b/net/subversion/Makefile index f7945a839b..9064babb8d 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -83,12 +83,12 @@ endef define Package/subversion-client/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/{svn,svnversion,svnsync} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{svn,svnversion,svnsync} $(1)/usr/bin/ endef define Package/subversion-server/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/svn{look,admin,dumpfilter,serve} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svn{look,admin,dumpfilter,serve} $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) ./files/subversion.config $(1)/etc/config/subversion $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index befe7401aa..eed0178603 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -52,7 +52,7 @@ endef define Package/tcpdump/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/ endef $(eval $(call BuildPackage,tcpdump)) diff --git a/net/tinc/Makefile b/net/tinc/Makefile index a4e14a9a23..2fa8d592c2 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -48,7 +48,7 @@ endef define Package/tinc/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,tinc)) diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile index a1e9dbac3e..5556af821e 100644 --- a/net/tinyproxy/Makefile +++ b/net/tinyproxy/Makefile @@ -47,7 +47,7 @@ endef define Package/tinyproxy/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/share/tinyproxy $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/ $(INSTALL_DIR) $(1)/etc/tinyproxy diff --git a/net/tmsnc/Makefile b/net/tmsnc/Makefile index aa7a540add..f4b822f666 100644 --- a/net/tmsnc/Makefile +++ b/net/tmsnc/Makefile @@ -51,7 +51,7 @@ endef define Package/tmsnc/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/tmsnc $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmsnc $(1)/usr/bin/ endef $(eval $(call BuildPackage,tmsnc)) diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index ab81f752b9..62d95a2b85 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -48,7 +48,7 @@ endef define Package/tsocks/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/bin/tsocks $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tsocks $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/lib/libtsocks.so{,*} $(1)/usr/lib/ endef diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile index aed17d97f2..1d65f6b0fe 100644 --- a/net/ulogd/Makefile +++ b/net/ulogd/Makefile @@ -120,7 +120,7 @@ define Package/ulogd/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/ulogd $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/ $(INSTALL_DIR) $(1)/etc/default diff --git a/net/vgp/Makefile b/net/vgp/Makefile index 16e8a88ec4..5e4c94daf4 100644 --- a/net/vgp/Makefile +++ b/net/vgp/Makefile @@ -46,7 +46,7 @@ endef define Package/vgp/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/ endef $(eval $(call BuildPackage,vgp)) diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile index adbccea981..8b9f43857f 100644 --- a/net/wccpd/Makefile +++ b/net/wccpd/Makefile @@ -47,7 +47,7 @@ endef define Package/wccpd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wccpd)) diff --git a/net/weechat/Makefile b/net/weechat/Makefile index c5b0158ed0..f5c957973b 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -106,7 +106,7 @@ endef define Package/weechat/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/weechat/plugins endef diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index c3bd76decd..a74890214f 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -48,8 +48,8 @@ MAKE_FLAGS += \ define Package/wifidog/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init - $(CP) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/etc diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index 754f793c7d..bf242513f4 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -47,7 +47,7 @@ endef define Package/xinetd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/xinetd.conf $(1)/etc/xinetd.conf $(INSTALL_DIR) $(1)/etc/xinetd.d diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile index e8f005eac7..f5e11efc33 100644 --- a/net/xsupplicant/Makefile +++ b/net/xsupplicant/Makefile @@ -65,9 +65,9 @@ define Package/xsupplicant/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/ endef $(eval $(call BuildPackage,xsupplicant)) diff --git a/sound/flite/Makefile b/sound/flite/Makefile index afb2c1c2d3..93a7d1298a 100644 --- a/sound/flite/Makefile +++ b/sound/flite/Makefile @@ -64,7 +64,7 @@ endef define Package/flite/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/flite $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flite $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ endef diff --git a/sound/lame/Makefile b/sound/lame/Makefile index 0bbc450cb1..f26919daf3 100644 --- a/sound/lame/Makefile +++ b/sound/lame/Makefile @@ -55,7 +55,7 @@ endef define Package/lame/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/ endef define Package/lame-lib/install diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile index e19f2219c0..2a4b7a8672 100644 --- a/sound/madplay/Makefile +++ b/sound/madplay/Makefile @@ -61,7 +61,7 @@ endef define Package/madplay/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/ endef $(eval $(call BuildPackage,madplay)) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index c607007e96..4ae9fbfdc8 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -73,7 +73,7 @@ define Package/mpd/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/ endef $(eval $(call BuildPackage,mpd)) diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile index 3f7eeeff0f..97e499ddb9 100644 --- a/sound/mt-daapd/Makefile +++ b/sound/mt-daapd/Makefile @@ -64,7 +64,7 @@ define Package/mt-daapd/install $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(1)/usr/share/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd endef diff --git a/sound/streamripper/Makefile b/sound/streamripper/Makefile index 79fc063b6a..fd55952d86 100644 --- a/sound/streamripper/Makefile +++ b/sound/streamripper/Makefile @@ -54,8 +54,8 @@ endef define Package/streamripper/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtre.so* $(1)/usr/lib/ endef diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile index b594aa60f9..c086879d7e 100644 --- a/utils/alsa-utils/Makefile +++ b/utils/alsa-utils/Makefile @@ -43,9 +43,9 @@ endef define Package/alsa-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/amixer $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/alsamixer $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/aplay $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amixer $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alsamixer $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aplay $(1)/usr/bin/ endef $(eval $(call BuildPackage,alsa-utils)) diff --git a/utils/bash/Makefile b/utils/bash/Makefile index 23f034ea7c..a9058e5132 100644 --- a/utils/bash/Makefile +++ b/utils/bash/Makefile @@ -54,7 +54,7 @@ endef define Package/bash/install $(INSTALL_DIR) $(1)/bin - $(CP) $(PKG_INSTALL_DIR)/bin/bash $(1)/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/bash $(1)/bin/ endef $(eval $(call BuildPackage,bash)) diff --git a/utils/binutils/Makefile b/utils/binutils/Makefile index 37dd36b5c1..bdda95e0fe 100644 --- a/utils/binutils/Makefile +++ b/utils/binutils/Makefile @@ -53,7 +53,7 @@ endef define Package/binutils/install $(INSTALL_DIR) $(1)/usr - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr $(CP) $(PKG_INSTALL_DIR)/usr/*-linux $(1)/usr endef diff --git a/utils/bluez-hcidump/Makefile b/utils/bluez-hcidump/Makefile index a44f9308f7..eb4b94a773 100644 --- a/utils/bluez-hcidump/Makefile +++ b/utils/bluez-hcidump/Makefile @@ -43,7 +43,7 @@ endef define Package/bluez-hcidump/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/ endef $(eval $(call BuildPackage,bluez-hcidump)) diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile index 06c069f2da..8067073258 100644 --- a/utils/bluez-utils/Makefile +++ b/utils/bluez-utils/Makefile @@ -64,9 +64,9 @@ endef define Package/bluez-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/bluetooth $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(1)/etc/bluetooth/ $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(1)/etc/bluetooth/ diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 4ec21c0397..4362c568bb 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -122,7 +122,7 @@ define Package/dbus/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dbus-daemon $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dbus-daemon $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/ endef @@ -130,7 +130,7 @@ endef define Package/dbus-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dbus-* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-* $(1)/usr/bin/ endef diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index 737d3b8909..c674aca23c 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -53,10 +53,10 @@ endef define Package/dosfstools/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.{msdos,vfat} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.{msdos,vfat} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,dosfstools)) diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile index f2b7f65bd0..d6d0812f54 100644 --- a/utils/fetchmail/Makefile +++ b/utils/fetchmail/Makefile @@ -51,7 +51,7 @@ endef define Package/fetchmail/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ endef $(eval $(call BuildPackage,fetchmail)) diff --git a/utils/gnokii/Makefile b/utils/gnokii/Makefile index 0a054550f6..0bca863e41 100644 --- a/utils/gnokii/Makefile +++ b/utils/gnokii/Makefile @@ -59,9 +59,9 @@ define Package/gnokii/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnokii $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/gnokiid $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mgnokiidev $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnokii $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gnokiid $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mgnokiidev $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3.5.0 $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3 $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so $(1)/usr/lib diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 54ba0c6c2f..9c8675f13a 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -45,8 +45,8 @@ endef define Package/lrzsz/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/ (cd $(1)/usr/bin; \ ln -fs lrz lrx; \ ln -fs lrz lrb; \ diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile index 29b5ff692c..92edc1bee6 100644 --- a/utils/macchanger/Makefile +++ b/utils/macchanger/Makefile @@ -41,7 +41,7 @@ endef define Package/macchanger/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/macchanger $(1)/usr/share/ endef diff --git a/utils/nano/Makefile b/utils/nano/Makefile index 5dfa194a86..f71325011e 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -54,7 +54,7 @@ endef define Package/nano/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/nano $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nano $(1)/usr/bin/ endef $(eval $(call BuildPackage,nano)) diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile index 76fd7e9f94..e03d8d50d5 100644 --- a/utils/ntfs-3g/Makefile +++ b/utils/ntfs-3g/Makefile @@ -61,7 +61,7 @@ endef define Package/ntfs-3g/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/ endef diff --git a/utils/reiserfsprogs/Makefile b/utils/reiserfsprogs/Makefile index 5ed813d41b..c5972dbc90 100644 --- a/utils/reiserfsprogs/Makefile +++ b/utils/reiserfsprogs/Makefile @@ -44,11 +44,11 @@ endef define Package/reiserfsprogs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/debugreiserfs $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkreiserfs $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reiserfsck $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reiserfstune $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize_reiserfs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/debugreiserfs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkreiserfs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/reiserfsck $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/reiserfstune $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize_reiserfs $(1)/usr/sbin/ ln -sf mkreiserfs $(1)/usr/sbin/mkfs.reiserfs ln -sf reiserfsck $(1)/usr/sbin/fsck.reiserfs endef diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index 69f092a87a..bf01704f44 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -89,7 +89,7 @@ endef define Package/rrdcollect/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/ endef define Package/rrdcollect-example/install diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 25035d9d06..46660fefe0 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -125,7 +125,7 @@ endef define Package/rrdcgi/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ endef define PyPackage/rrdpy/install @@ -135,8 +135,8 @@ endef define Package/rrdtool/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/ endef $(eval $(call BuildPackage,librrd)) diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index 39d105dc2d..1472744172 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -72,7 +72,7 @@ define Package/sane-backends/install $(INSTALL_DIR) $(1)/etc/sane.d $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/saned $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/saned $(1)/usr/sbin/ endef define Package/sane-libs/install diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile index 4e7244aa8f..ed338dcc05 100644 --- a/utils/unzip/Makefile +++ b/utils/unzip/Makefile @@ -53,7 +53,7 @@ endef define Package/unzip/install $(INSTALL_DIR) $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,unzip)) diff --git a/utils/valgrind/Makefile b/utils/valgrind/Makefile index a614851154..4db3d5a19c 100644 --- a/utils/valgrind/Makefile +++ b/utils/valgrind/Makefile @@ -58,7 +58,7 @@ endef define Package/valgrind/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_BIN) ./files/valgrind.sh $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/valgrind $(CP) ./files/uclibc.supp $(1)/usr/lib/valgrind/ diff --git a/utils/zip/Makefile b/utils/zip/Makefile index 6b5461abe7..8b4521e0c9 100644 --- a/utils/zip/Makefile +++ b/utils/zip/Makefile @@ -53,7 +53,7 @@ endef define Package/zip/install $(INSTALL_DIR) $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,zip)) -- 2.30.2