From: mbm Date: Wed, 1 Feb 2006 23:53:19 +0000 (+0000) Subject: change cp to $(CP) X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 0135ad8459..8b24d7baa5 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -54,7 +54,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_6TUNNEL): install -d -m0755 $(IDIR_6TUNNEL)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/ $(RSTRIP) $(IDIR_6TUNNEL)/ $(IPKG_BUILD) $(IDIR_6TUNNEL) $(PACKAGE_DIR) diff --git a/package/Config.in b/package/Config.in index 6f1c5fe300..83ef404e1e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -130,7 +130,6 @@ source "package/slurm/Config.in" source "package/snort/Config.in" source "package/snort-wireless/Config.in" source "package/socat/Config.in" -source "package/ssltunnel/Config.in" source "package/ssmtp/Config.in" source "package/srelay/Config.in" source "package/tmsnc/Config.in" @@ -180,7 +179,6 @@ source "package/libamsel/Config.in" source "package/libao/Config.in" source "package/libart/Config.in" source "package/libcli/Config.in" -source "package/clinkc/Config.in" source "package/curl/Config.in" # libcurl source "package/libdaemon/Config.in" source "package/libdb/Config.in" @@ -256,6 +254,7 @@ source "package/setserial/Config.in" comment "Utilities" source "package/bc/Config.in" source "package/gdbserver/Config.in" +source "package/madwifi-tools/Config.in" source "package/pcmcia-cs/Config.in" # pcmcia-utils source "package/usbutils/Config.in" # lsusb source "package/pciutils/Config.in" diff --git a/package/Makefile b/package/Makefile index 5e29f88073..f2ad1c2061 100644 --- a/package/Makefile +++ b/package/Makefile @@ -21,7 +21,6 @@ package-$(BR2_PACKAGE_BWM) += bwm package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount -package-$(BR2_PACKAGE_CLINKC) += clinkc package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_COMPILE_CURL) += curl @@ -210,7 +209,6 @@ package-$(BR2_COMPILE_SPEEX) += speex package-$(BR2_COMPILE_SQLITE) += sqlite package-$(BR2_COMPILE_SQLITE2) += sqlite2 package-$(BR2_PACKAGE_SSMTP) += ssmtp -package-$(BR2_PACKAGE_SSLTUNNEL) += ssltunnel package-$(BR2_PACKAGE_SRELAY) += srelay package-$(BR2_PACKAGE_STRACE) += strace package-$(BR2_PACKAGE_TCPDUMP) += tcpdump @@ -271,7 +269,6 @@ arpwatch-compile: libpcap-compile atftp-compile: readline-compile avahi-compile: libdaemon-compile expat-compile libgdbm-compile bind-compile: openssl-compile -clinkc-compile: expat-compile curl-compile: openssl-compile zlib-compile cyrus-sasl-compile: openssl-compile deco-compile: ncurses-compile @@ -308,7 +305,6 @@ lighttpd-compile: openssl-compile pcre-compile madplay-compile: libid3tag-compile libmad-compile miax-compile: bluez-libs-compile miredo-compile: uclibc++-compile -monit-compile: openssl-compile mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile mtr-compile: ncurses-compile mysql-compile: ncurses-compile zlib-compile readline-compile @@ -349,7 +345,6 @@ sipsak-compile: openssl-compile socat-compile: openssl-compile sqlite-compile: ncurses-compile readline-compile sqlite2-compile: ncurses-compile readline-compile -ssltunnel-compile: openssl-compile ppp-compile tcpdump-compile: libpcap-compile tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile diff --git a/package/aircrack/Makefile b/package/aircrack/Makefile index 1869d2b82b..feb43044d3 100644 --- a/package/aircrack/Makefile +++ b/package/aircrack/Makefile @@ -35,11 +35,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_AIRCRACK): install -d -m0755 $(IDIR_AIRCRACK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/aircrack $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/airdecap $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/aireplay $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/airodump $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/arpforge $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/aircrack $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/airdecap $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/aireplay $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/airodump $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/arpforge $(IDIR_AIRCRACK)/usr/bin/ $(RSTRIP) $(IDIR_AIRCRACK) $(IPKG_BUILD) $(IDIR_AIRCRACK) $(PACKAGE_DIR) diff --git a/package/amwall/Makefile b/package/amwall/Makefile index 3fedcab960..a2e3c391b2 100644 --- a/package/amwall/Makefile +++ b/package/amwall/Makefile @@ -38,11 +38,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_AMWALL): install -d -m0755 $(IDIR_AMWALL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin install -d -m0755 $(IDIR_AMWALL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin install -d -m0755 $(IDIR_AMWALL)/etc/amsel - cp -fpR $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc + $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc $(RSTRIP) $(IDIR_AMWALL) $(IPKG_BUILD) $(IDIR_AMWALL) $(PACKAGE_DIR) diff --git a/package/arpd/Makefile b/package/arpd/Makefile index ad75e22d05..6707eff30b 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -59,6 +59,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ARPD): mkdir -p $(IDIR_ARPD)/usr/sbin - cp $(PKG_BUILD_DIR)/arpd $(IDIR_ARPD)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpd $(IDIR_ARPD)/usr/sbin/ $(STRIP) $(IDIR_ARPD)/usr/sbin/* $(IPKG_BUILD) $(IDIR_ARPD) $(PACKAGE_DIR) diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 27e6c795e7..a20c58f52e 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -55,9 +55,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ARPWATCH): mkdir -p $(IDIR_ARPWATCH)/usr/sbin - cp $(PKG_BUILD_DIR)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/ - cp $(PKG_BUILD_DIR)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/ $(STRIP) $(IDIR_ARPWATCH)/usr/sbin/* mkdir -p $(IDIR_ARPWATCH)/etc/arpwatch - cp $(PKG_BUILD_DIR)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/ + $(CP) $(PKG_BUILD_DIR)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/ $(IPKG_BUILD) $(IDIR_ARPWATCH) $(PACKAGE_DIR) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8f39127fc2..eb6edee1d7 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -82,7 +82,7 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_ASTERISK): - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_ASTERISK) + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_ASTERISK) rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey rm -rf $(IDIR_ASTERISK)/usr/bin rm -rf $(IDIR_ASTERISK)/usr/share @@ -128,23 +128,23 @@ $(IPKG_ASTERISK): $(IPKG_ASTERISK_MINI): install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/asterisk for f in asterisk enum extconfig extensions features iax iaxprov logger manager modules musiconhold rtp sip; do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/asterisk/$$f.conf $(IDIR_ASTERISK_MINI)/etc/asterisk/ ; \ + $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$f.conf $(IDIR_ASTERISK_MINI)/etc/asterisk/ ; \ done install -m0644 ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/asterisk/firmware $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/firmware $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/ install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/keys install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules for f in chan_iax2 chan_local chan_sip codec_gsm codec_ulaw format_gsm format_pcm format_wav \ format_wav_gsm pbx_config res_features res_musiconhold; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$f.so $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$f.so $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules/ ; \ done install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/mohmp3 install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/sounds install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/default install -m0644 ./files/asterisk.default $(IDIR_ASTERISK_MINI)/etc/default/asterisk install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/init.d @@ -179,7 +179,7 @@ $(IPKG_ASTERISK_SQLITE): $(IPKG_ASTERISK_SOUNDS): install -d -m0755 $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds - cp -fpR $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ + $(CP) $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3 rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-* $(IPKG_BUILD) $(IDIR_ASTERISK_SOUNDS) $(PACKAGE_DIR) @@ -191,7 +191,7 @@ $(IPKG_ASTERISK_VOICEMAIL): install -m0755 $(PKG_BUILD_DIR)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ install -m0755 $(PKG_BUILD_DIR)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds - cp -fpR $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ + $(CP) $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ $(RSTRIP) $(IDIR_ASTERISK_VOICEMAIL) $(IPKG_BUILD) $(IDIR_ASTERISK_VOICEMAIL) $(PACKAGE_DIR) diff --git a/package/atftp/Config.in b/package/atftp/Config.in index 296faec842..32ab9512a3 100644 --- a/package/atftp/Config.in +++ b/package/atftp/Config.in @@ -4,7 +4,6 @@ config BR2_COMPILE_ATFTP tristate default n depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD - select BR2_PACKAGE_LIBREADLINE config BR2_PACKAGE_ATFTP prompt "atftp............................. TFTP client" diff --git a/package/atftp/Makefile b/package/atftp/Makefile index a609c53d36..f49aab6701 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -60,12 +60,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ATFTP): install -d -m0755 $(IDIR_ATFTP)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin + $(CP) $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin $(RSTRIP) $(IDIR_ATFTP) $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR) $(IPKG_ATFTPD): install -d -m0755 $(IDIR_ATFTPD)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin $(RSTRIP) $(IDIR_ATFTPD) $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR) diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control index ca4d86a308..d2083fc619 100644 --- a/package/atftp/ipkg/atftp.control +++ b/package/atftp/ipkg/atftp.control @@ -2,4 +2,3 @@ Package: atftp Priority: optional Section: net Description: tftp client -Depends: libreadline diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control index acdd2f1ced..efb40299c3 100644 --- a/package/atftp/ipkg/atftpd.control +++ b/package/atftp/ipkg/atftpd.control @@ -2,4 +2,3 @@ Package: atftpd Priority: optional Section: net Description: tftp server -Depends: libreadline diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a082d54699..16fb203851 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -99,36 +99,36 @@ $(IPKG_AVAHI_DAEMON): install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/init.d install -m0755 ./files/avahi-daemon.init $(IDIR_AVAHI_DAEMON)/etc/init.d/avahi-daemon install -d -m0755 $(IDIR_AVAHI_DAEMON)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/ $(RSTRIP) $(IDIR_AVAHI_DAEMON) $(IPKG_BUILD) $(IDIR_AVAHI_DAEMON) $(PACKAGE_DIR) $(IPKG_AVAHI_DNSCONFD): install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/etc/avahi - cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/ + $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/ install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/ $(RSTRIP) $(IDIR_AVAHI_DNSCONFD) $(IPKG_BUILD) $(IDIR_AVAHI_DNSCONFD) $(PACKAGE_DIR) $(IPKG_LIBAVAHI): install -d -m0755 $(IDIR_LIBAVAHI)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/ $(RSTRIP) $(IDIR_LIBAVAHI) $(IPKG_BUILD) $(IDIR_LIBAVAHI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/avahi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc touch $@ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e4753d045c..2604e62578 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -52,7 +52,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BASE): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH) - cp -a ./default/* $(IDIR_BASE) + $(CP) ./default/* $(IDIR_BASE) $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf mkdir -p $(IDIR_BASE)/sys @@ -77,8 +77,8 @@ $(IPKG_UCLIBC): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_UCLIBC)/lib for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ - cp -fpR $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \ - cp -fpR $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \ + $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \ + $(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \ done -$(STRIP) $(IDIR_UCLIBC)/lib/* $(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR) @@ -86,7 +86,7 @@ $(IPKG_UCLIBC): $(IPKG_LIBGCC): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBGCC)/lib - cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ + $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ -$(STRIP) $(IDIR_LIBGCC)/lib/* $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR) diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall index 8789fbab60..0110cfc775 100755 --- a/package/base-files/default/etc/init.d/S45firewall +++ b/package/base-files/default/etc/init.d/S45firewall @@ -81,8 +81,11 @@ iptables -t nat -N postrouting_rule iptables -A FORWARD -j forwarding_rule # allow - iptables -A FORWARD -i br0 -o br0 -j ACCEPT - + # if there is bridge splitting this workaround works too + for iface in $LAN; do + iptables -A FORWARD -i $iface -o $iface -j ACCEPT + [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT + done # reject (what to do with anything not allowed earlier) # uses the default -P DROP diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root index 427ff0444f..693c694c1b 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then pivot_root /jffs /jffs/rom mount none /proc -t proc mount none /dev -t devfs - umount /rom/proc /rom/dev >&- + umount /rom/proc rom/dev >&- fi fi fi diff --git a/package/bind/Makefile b/package/bind/Makefile index eeb428ac30..ba895f3c03 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -70,15 +70,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BIND_SERVER): install -d -m0755 $(IDIR_BIND_SERVER)/usr/sbin install -d -m0755 $(IDIR_BIND_SERVER)/etc/init.d - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/ - cp -fpR files/bind $(IDIR_BIND_SERVER)/etc - cp -fpR files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/ + $(CP) files/bind $(IDIR_BIND_SERVER)/etc + $(CP) files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named find $(IDIR_BIND_SERVER)/etc/bind -name ".svn" | xargs rm -rf $(RSTRIP) $(IDIR_BIND_SERVER) $(IPKG_BUILD) $(IDIR_BIND_SERVER) $(PACKAGE_DIR) $(IPKG_BIND_CLIENT): install -d -m0755 $(IDIR_BIND_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_BIND_CLIENT) $(IPKG_BUILD) $(IDIR_BIND_CLIENT) $(PACKAGE_DIR) diff --git a/package/bluez-libs/Makefile b/package/bluez-libs/Makefile index 45d868310a..b02d61836f 100644 --- a/package/bluez-libs/Makefile +++ b/package/bluez-libs/Makefile @@ -64,15 +64,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BLUEZ_LIBS): install -d -m0755 $(IDIR_BLUEZ_LIBS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ $(RSTRIP) $(IDIR_BLUEZ_LIBS) $(IPKG_BUILD) $(IDIR_BLUEZ_LIBS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libbluetooth.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/bluetooth - cp -fpR $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth + $(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libbluetooth.so diff --git a/package/bluez-utils/Makefile b/package/bluez-utils/Makefile index 00a609b55e..1ac7d345d6 100644 --- a/package/bluez-utils/Makefile +++ b/package/bluez-utils/Makefile @@ -79,12 +79,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BLUEZ_UTILS): install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_BLUEZ_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_BLUEZ_UTILS)/usr/bin/ install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/ install -d -m0755 $(IDIR_BLUEZ_UTILS)/etc/bluetooth - cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ - cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ install -m0700 ./files/givepin $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ $(RSTRIP) $(IDIR_BLUEZ_UTILS) $(IPKG_BUILD) $(IDIR_BLUEZ_UTILS) $(PACKAGE_DIR) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 44b22cd722..601373b994 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -44,6 +44,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BRIDGE): mkdir -p $(IDIR_BRIDGE)/usr/sbin - cp $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ $(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl $(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR) diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 9a0534fe5d..b81effdb04 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -29,15 +29,15 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_CGILIB): install -d -m0755 $(IDIR_CGILIB)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/ $(RSTRIP) $(IDIR_CGILIB) $(IPKG_BUILD) $(IDIR_CGILIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcgi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libcgi.so diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 7e6fb76971..1d6323686c 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -68,6 +68,6 @@ $(IPKG_CHILLISPOT): install -m0755 -d $(IDIR_CHILLISPOT)/etc install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(IDIR_CHILLISPOT)/etc/ install -m0755 -d $(IDIR_CHILLISPOT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/ $(RSTRIP) $(IDIR_CHILLISPOT) $(IPKG_BUILD) $(IDIR_CHILLISPOT) $(PACKAGE_DIR) diff --git a/package/clinkc/Makefile b/package/clinkc/Makefile index 1d6bf1d6a2..caa624ce65 100644 --- a/package/clinkc/Makefile +++ b/package/clinkc/Makefile @@ -57,7 +57,7 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_CLINKC): - cp -fpR $(PKG_INSTALL_DIR) $(IDIR_CLINKC) + $(CP) $(PKG_INSTALL_DIR) $(IDIR_CLINKC) $(RSTRIP) $(IDIR_CLINKC) $(IPKG_BUILD) $(IDIR_CLINKC) $(PACKAGE_DIR) diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 5d7bc34719..e757f965a5 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -93,9 +93,9 @@ $(IPKG_COLLECTD): install -d -m0755 $(IDIR_COLLECTD)/usr/lib/collectd install -d -m0755 $(IDIR_COLLECTD)/var/lib/collectd install -d -m0755 $(IDIR_COLLECTD)/var/run - cp -fpR ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/ + $(CP) ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/ $(RSTRIP) $(IDIR_COLLECTD) $(IPKG_BUILD) $(IDIR_COLLECTD) $(PACKAGE_DIR) diff --git a/package/config/Makefile b/package/config/Makefile index 455a33d233..e8a2d4bf1f 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -77,16 +77,16 @@ lex.zconf.o: lex.zconf.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ lex.zconf.c: lex.zconf.c_shipped - cp lex.zconf.c_shipped lex.zconf.c + $(CP) lex.zconf.c_shipped lex.zconf.c zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ zconf.tab.c: zconf.tab.c_shipped - cp zconf.tab.c_shipped zconf.tab.c + $(CP) zconf.tab.c_shipped zconf.tab.c zconf.tab.h: zconf.tab.h_shipped - cp zconf.tab.h_shipped zconf.tab.h + $(CP) zconf.tab.h_shipped zconf.tab.h endif .PHONY: ncurses diff --git a/package/cups/Makefile b/package/cups/Makefile index 8ffa8665fb..bb3e9d33d7 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -73,24 +73,24 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CUPS): rm -rf $(IDIR_CUPS)/etc/cups install -d -m0755 $(IDIR_CUPS)/etc/cups - cp -fpR $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/ + $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/ rm -rf $(IDIR_CUPS)/etc/cups/certs ln -sf /tmp $(IDIR_CUPS)/etc/cups/certs install -d -m0755 $(IDIR_CUPS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/ rm -f $(IDIR_CUPS)/usr/bin/cups-config install -d -m0755 $(IDIR_CUPS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/ install -d -m0755 $(IDIR_CUPS)/usr/share/cups/templates - cp -fpR $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/ install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups - cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/ install -d -m0755 $(IDIR_CUPS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/ # overwrite default config with our own - cp -fpR ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/ + $(CP) ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/ # install initscript with priority 60 install -d -m0755 $(IDIR_CUPS)/etc/init.d install -m0755 ./files/cupsd.init $(IDIR_CUPS)/etc/init.d/S60cupsd @@ -100,11 +100,11 @@ $(IPKG_CUPS): $(STAGING_DIR)/usr/lib/libcups.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libcups.so diff --git a/package/curl/Makefile b/package/curl/Makefile index 02ea0a3526..1a4ee86771 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -91,24 +91,24 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CURL): install -m0755 -d $(IDIR_CURL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl $(IDIR_CURL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(IDIR_CURL)/usr/bin/ $(RSTRIP) $(IDIR_CURL) $(IPKG_BUILD) $(IDIR_CURL) $(PACKAGE_DIR) $(IPKG_LIBCURL): install -m0755 -d $(IDIR_LIBCURL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(IDIR_LIBCURL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(IDIR_LIBCURL)/usr/lib/ $(RSTRIP) $(IDIR_LIBCURL) $(IPKG_BUILD) $(IDIR_LIBCURL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcurl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(STAGING_DIR)/usr/lib/ $(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/bin/curl-config $(SED) 's,-L/usr/lib,,g' $(STAGING_DIR)/usr/bin/curl-config touch $@ diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 361d1e750f..418718f1a5 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -27,6 +27,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CUTTER): mkdir -p $(IDIR_CUTTER) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_CUTTER)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_CUTTER)/ $(RSTRIP) $(IDIR_CUTTER)/ $(IPKG_BUILD) $(IDIR_CUTTER) $(PACKAGE_DIR) diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 84238db55d..e89bee1894 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -100,21 +100,21 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSASL2): install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(IDIR_LIBSASL2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(IDIR_LIBSASL2)/usr/lib/ install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/sasl2 - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(IDIR_LIBSASL2)/usr/lib/sasl2/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(IDIR_LIBSASL2)/usr/lib/sasl2/ $(RSTRIP) $(IDIR_LIBSASL2) $(IPKG_BUILD) $(IDIR_LIBSASL2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsasl2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(STAGING_DIR)/usr/lib/ ln -sf libsasl2.a $(STAGING_DIR)/usr/lib/libsasl.a ln -sf libsasl2.so $(STAGING_DIR)/usr/lib/libsasl.so mkdir -p $(STAGING_DIR)/usr/lib/sasl2 - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(STAGING_DIR)/usr/lib/sasl2/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(STAGING_DIR)/usr/lib/sasl2/ install-dev: $(STAGING_DIR)/usr/lib/libsasl2.so diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index f92107c7f0..0a86efcf25 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -61,6 +61,6 @@ $(IPKG_DHCP_FORWARDER): install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d install -m0755 ./files/dhcp-fwd.init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd install -m0755 -d $(IDIR_DHCP_FORWARDER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/ $(RSTRIP) $(IDIR_DHCP_FORWARDER) $(IPKG_BUILD) $(IDIR_DHCP_FORWARDER) $(PACKAGE_DIR) diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index 4914cc4ae5..8ee56ff4a6 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -38,12 +38,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DHCP_RELAY): install -d -m0755 $(IDIR_DHCP_RELAY)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/ $(RSTRIP) $(IDIR_DHCP_RELAY) $(IPKG_BUILD) $(IDIR_DHCP_RELAY) $(PACKAGE_DIR) $(IPKG_DHCP_SERVER): install -d -m0755 $(IDIR_DHCP_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_DHCP_SERVER) $(IPKG_BUILD) $(IDIR_DHCP_SERVER) $(PACKAGE_DIR) diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile index 9883ad18f9..e007abad29 100755 --- a/package/dhcp6/Makefile +++ b/package/dhcp6/Makefile @@ -32,6 +32,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DHCP6): mkdir -p $(IDIR_DHCP6) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_DHCP6)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_DHCP6)/ $(RSTRIP) $(IDIR_DHCP6) $(IPKG_BUILD) $(IDIR_DHCP6) $(PACKAGE_DIR) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 405801063a..215697cdb3 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.26 +PKG_VERSION:=2.25 PKG_RELEASE:=1 -PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c +PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -27,7 +27,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DNSMASQ): install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index dc1982b901..91b455e9db 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -33,10 +33,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DOSFSTOOLS): install -d -m0755 $(IDIR_DOSFSTOOLS)/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/dosfsck $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/fsck.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkdosfs $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkfs.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/dosfsck $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/fsck.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkdosfs $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ $(RSTRIP) $(IDIR_DOSFSTOOLS) $(IPKG_BUILD) $(IDIR_DOSFSTOOLS) $(PACKAGE_DIR) diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index 484f0c54be..ee5a19863c 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -66,8 +66,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DSNIFF): install -d -m0755 $(IDIR_DSNIFF)/usr/lib install -d -m0755 $(IDIR_DSNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib $(RSTRIP) $(IDIR_DSNIFF) $(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 6bb89078c5..b4393e2ebb 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -69,11 +69,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_E2FSPROGS): mkdir -p $(IDIR_E2FSPROGS)/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/e2fsck $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mke2fs $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkfs.ext{2,3} $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/tune2fs $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/e2fsck $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mke2fs $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.ext{2,3} $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/tune2fs $(IDIR_E2FSPROGS)/sbin/ mkdir -p $(IDIR_E2FSPROGS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(IDIR_E2FSPROGS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(IDIR_E2FSPROGS)/usr/lib/ $(RSTRIP) $(IDIR_E2FSPROGS) $(IPKG_BUILD) $(IDIR_E2FSPROGS) $(PACKAGE_DIR) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index a928a2dbb1..9abd93a93a 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -27,6 +27,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_EBTABLES): mkdir -p $(IDIR_EBTABLES)/usr/sbin - cp $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR) diff --git a/package/elhttp/Makefile b/package/elhttp/Makefile index 1d747d6fb8..6c83185106 100644 --- a/package/elhttp/Makefile +++ b/package/elhttp/Makefile @@ -31,7 +31,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ELHTTP): mkdir -p $(IDIR_ELHTTP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_ELHTTP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_ELHTTP)/ $(RSTRIP) $(IDIR_ELHTTP)/ $(IPKG_BUILD) $(IDIR_ELHTTP) $(PACKAGE_DIR) diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index 5ebcf46da1..9618b3e3e1 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -14,7 +14,7 @@ $(eval $(call PKG_template,ETHER_WAKE,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE), $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp ./files/$(PKG_NAME).c $(PKG_BUILD_DIR)/ + $(CP) ./files/$(PKG_NAME).c $(PKG_BUILD_DIR)/ $(PATCH) $(PKG_BUILD_DIR) ./patches touch $@ diff --git a/package/expat/Makefile b/package/expat/Makefile index ef9f3a9b53..47c8e81b18 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -59,17 +59,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBEXPAT): install -m0755 -d $(IDIR_LIBEXPAT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/ $(RSTRIP) $(IDIR_LIBEXPAT) $(IPKG_BUILD) $(IDIR_LIBEXPAT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libexpat.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libexpat.so diff --git a/package/flac/Makefile b/package/flac/Makefile index 0e18c5f334..b06cf0ec4d 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -32,16 +32,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFLAC): install -m0755 -d $(IDIR_LIBFLAC)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(IDIR_LIBFLAC)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(IDIR_LIBFLAC)/usr/lib/ $(RSTRIP) $(IDIR_LIBFLAC) $(IPKG_BUILD) $(IDIR_LIBFLAC) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libFLAC.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libFLAC.so diff --git a/package/fping/Makefile b/package/fping/Makefile index 627d8fc619..998d3485fc 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -48,8 +48,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPING): mkdir -p $(IDIR_FPING)/usr/bin - cp $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME) - cp $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME) + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/ $(STRIP) $(IDIR_FPING)/usr/bin/* $(IPKG_BUILD) $(IDIR_FPING) $(PACKAGE_DIR) diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile index f5f3c53f68..6ea2493090 100644 --- a/package/fprobe-ulog/Makefile +++ b/package/fprobe-ulog/Makefile @@ -47,6 +47,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPROBE_ULOG): mkdir -p $(IDIR_FPROBE_ULOG)/usr/bin - cp $(PKG_BUILD_DIR)/src/fprobe-ulog $(IDIR_FPROBE_ULOG)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fprobe-ulog $(IDIR_FPROBE_ULOG)/usr/bin/ $(RSTRIP) $(IDIR_FPROBE_ULOG) $(IPKG_BUILD) $(IDIR_FPROBE_ULOG) $(PACKAGE_DIR) diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 91f0c05ccd..fed7e3b540 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -49,6 +49,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPROBE): mkdir -p $(IDIR_FPROBE)/usr/bin - cp $(PKG_BUILD_DIR)/src/fprobe $(IDIR_FPROBE)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fprobe $(IDIR_FPROBE)/usr/bin/ $(STRIP) $(IDIR_FPROBE)/usr/bin/* $(IPKG_BUILD) $(IDIR_FPROBE) $(PACKAGE_DIR) diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index 0f8f4b031d..0ae21bbb76 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -83,12 +83,12 @@ define PKG_mod_template $$(IPKG_$(1)): [ -z "$(2)" ] || install -d -m0755 $$(IDIR_$(1))/usr/lib/freeradius for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ $$(IDIR_$(1))/usr/lib/freeradius/ ; \ done [ -z "$(3)" ] || install -d -m0755 $$(IDIR_$(1))/etc/freeradius for f in $(3); do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ $$(IDIR_$(1))/etc/freeradius/ ; \ done $(RSTRIP) $$(IDIR_$(1)) @@ -186,28 +186,28 @@ $(IPKG_FREERADIUS): install -m0755 ./files/radiusd.init $(IDIR_FREERADIUS)/etc/init.d/radiusd install -m0755 -d $(IDIR_FREERADIUS)/etc/freeradius for f in clients.conf dictionary radiusd.conf; do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ $(IDIR_FREERADIUS)/etc/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/share/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ $(IDIR_FREERADIUS)/usr/share/freeradius/ for f in cisco freeradius microsoft tunnel wispr; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ $(IDIR_FREERADIUS)/usr/share/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/lib/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ $(IDIR_FREERADIUS)/usr/lib/freeradius/ install -m0755 -d $(IDIR_FREERADIUS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ $(IDIR_FREERADIUS)/usr/sbin/ $(RSTRIP) $(IDIR_FREERADIUS) $(IPKG_BUILD) $(IDIR_FREERADIUS) $(PACKAGE_DIR) $(IPKG_FREERADIUS_DEMOCERTS): install -m0755 -d $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/certs \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/certs \ $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/ rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/README rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/new* @@ -219,7 +219,7 @@ $(IPKG_FREERADIUS_DEMOCERTS): $(IPKG_FREERADIUS_UTILS): install -m0755 -d $(IDIR_FREERADIUS_UTILS)/usr/bin for f in radclient radeapclient; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/$${f} \ $(IDIR_FREERADIUS_UTILS)/usr/bin/ ; \ done $(RSTRIP) $(IDIR_FREERADIUS_UTILS) diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5744970f10..429df1d09e 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -58,20 +58,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFREETYPE): install -d -m0755 $(IDIR_LIBFREETYPE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(IDIR_LIBFREETYPE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(IDIR_LIBFREETYPE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFREETYPE) $(IPKG_BUILD) $(IDIR_LIBFREETYPE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libfreetype.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/freetype2 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libfreetype.so diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 452a4ab7dd..7f3572e90d 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -72,25 +72,25 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFUSE): mkdir -p $(IDIR_LIBFUSE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFUSE) $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR) $(IPKG_FUSE_UTILS): mkdir -p $(IDIR_FUSE_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_FUSE_UTILS) $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 7e5d33ba80..922e631230 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GDBSERVER): install -m0755 -d $(IDIR_GDBSERVER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(IDIR_GDBSERVER)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(IDIR_GDBSERVER)/usr/bin/ $(RSTRIP) $(IDIR_GDBSERVER) $(IPKG_BUILD) $(IDIR_GDBSERVER) $(PACKAGE_DIR) diff --git a/package/glib/Makefile b/package/glib/Makefile index 2715d9fcc7..cb697995db 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -81,22 +81,22 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GLIB1): install -m0755 -d $(IDIR_GLIB1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/ $(RSTRIP) $(IDIR_GLIB1) $(IPKG_BUILD) $(IDIR_GLIB1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libglib.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $(STAGING_DIR)/usr/lib/libglib.so install-dev: $(STAGING_DIR)/usr/lib/libglib.so diff --git a/package/glib/patches/04-gcc3.4-fix b/package/glib/patches/04-gcc3.4-fix index 3eddcf6fe7..96f10b7fa7 100644 --- a/package/glib/patches/04-gcc3.4-fix +++ b/package/glib/patches/04-gcc3.4-fix @@ -5,7 +5,7 @@ Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/glib-1.2.10-gcc3 Upstream Status: not reported Description: fix compilation of glib1 with gcc34 -$LastChangedBy: bdubbs $ +$LastChangedBy$ $Date$ diff -Naur glib-1.2.10.orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index fb5823e26b..bbadfb1129 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -69,7 +69,7 @@ $(IPKG_GMEDIASERVER): install -m0755 -d $(IDIR_GMEDIASERVER)/etc/init.d install -m0755 ./files/gmediaserver.init $(IDIR_GMEDIASERVER)/etc/init.d/gmediaserver install -m0755 -d $(IDIR_GMEDIASERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/ $(RSTRIP) $(IDIR_GMEDIASERVER) $(IPKG_BUILD) $(IDIR_GMEDIASERVER) $(PACKAGE_DIR) diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 27d938427a..53db9451bc 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -57,15 +57,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGMP): install -m0755 -d $(IDIR_LIBGMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/ $(RSTRIP) $(IDIR_LIBGMP) $(IPKG_BUILD) $(IDIR_LIBGMP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgmp.so diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 4e7ccb95e0..5257850784 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -80,34 +80,34 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGNUTLS): install -m0755 -d $(IDIR_LIBGNUTLS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/ $(RSTRIP) $(IDIR_LIBGNUTLS) $(IPKG_BUILD) $(IDIR_LIBGNUTLS) $(PACKAGE_DIR) $(IPKG_LIBGNUTLS_OPENSSL): install -m0755 -d $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/ $(RSTRIP) $(IDIR_LIBGNUTLS_OPENSSL) $(IPKG_BUILD) $(IDIR_LIBGNUTLS_OPENSSL) $(PACKAGE_DIR) $(IPKG_GNUTLS_UTILS): install -m0755 -d $(IDIR_GNUTLS_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_GNUTLS_UTILS) $(IPKG_BUILD) $(IDIR_GNUTLS_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgnutls.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgnutls.so diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 43fad851cf..45748cb844 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -63,18 +63,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GPSD): install -d -m0755 $(IDIR_GPSD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/ install -d -m0755 $(IDIR_GPSD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/ $(RSTRIP) $(IDIR_GPSD) $(IPKG_BUILD) $(IDIR_GPSD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgps.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgps.so diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 0599696d8d..b30a6c5ab5 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -35,22 +35,22 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGSM): install -d -m0755 $(IDIR_LIBGSM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(IDIR_LIBGSM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(IDIR_LIBGSM)/usr/lib/ $(RSTRIP) $(IDIR_LIBGSM) $(IPKG_BUILD) $(IDIR_LIBGSM) $(PACKAGE_DIR) $(IPKG_GSM_UTILS): install -d -m0755 $(IDIR_GSM_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_GSM_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_GSM_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_GSM_UTILS) $(IPKG_BUILD) $(IDIR_GSM_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgsm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgsm.so diff --git a/package/haserl/Makefile b/package/haserl/Makefile index d9e1faacc1..05c6b47b1e 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -55,7 +55,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_HASERL): install -m0755 -d $(IDIR_HASERL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ $(RSTRIP) $(IDIR_HASERL) $(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR) diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index c3b8ec6aa0..7ac6770fc8 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp ./files/config $(PKG_BUILD_DIR)/.config + $(CP) ./files/config $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/howl/Makefile b/package/howl/Makefile index 8969f10fce..02d9b78f2b 100644 --- a/package/howl/Makefile +++ b/package/howl/Makefile @@ -63,13 +63,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBHOWL): install -m0755 -d $(IDIR_LIBHOWL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/ $(RSTRIP) $(IDIR_LIBHOWL) $(IPKG_BUILD) $(IDIR_LIBHOWL) $(PACKAGE_DIR) $(IPKG_HOWL_UTILS): install -m0755 -d $(IDIR_HOWL_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_HOWL_UTILS) $(IPKG_BUILD) $(IDIR_HOWL_UTILS) $(PACKAGE_DIR) @@ -79,7 +79,7 @@ $(IPKG_MDNSRESPONDER): install -m0755 -d $(IDIR_MDNSRESPONDER)/etc/init.d install -m0644 ./files/mDNSResponder.init $(IDIR_MDNSRESPONDER)/etc/init.d/mDNSResponder install -m0755 -d $(IDIR_MDNSRESPONDER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/ $(RSTRIP) $(IDIR_MDNSRESPONDER) $(IPKG_BUILD) $(IDIR_MDNSRESPONDER) $(PACKAGE_DIR) @@ -87,7 +87,7 @@ $(IPKG_AUTOIPD): install -m0755 -d $(IDIR_AUTOIPD)/etc/init.d install -m0644 ./files/autoipd.init $(IDIR_AUTOIPD)/etc/init.d/autoipd install -m0755 -d $(IDIR_AUTOIPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/ $(RSTRIP) $(IDIR_AUTOIPD) $(IPKG_BUILD) $(IDIR_AUTOIPD) $(PACKAGE_DIR) @@ -95,17 +95,17 @@ $(IPKG_NIFD): install -m0755 -d $(IDIR_NIFD)/etc/init.d install -m0644 ./files/nifd.init $(IDIR_NIFD)/etc/init.d/nifd install -m0755 -d $(IDIR_NIFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/ $(RSTRIP) $(IDIR_NIFD) $(IPKG_BUILD) $(IDIR_NIFD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libhowl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $(STAGING_DIR)/usr/lib/libhowl.so install-dev: $(STAGING_DIR)/usr/lib/libhowl.so diff --git a/package/icecast/Makefile b/package/icecast/Makefile index ffaee05a7b..ec2ed2405c 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -70,11 +70,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ICECAST): install -d -m0755 $(IDIR_ICECAST)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/icecast.xml $(IDIR_ICECAST)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(IDIR_ICECAST)/etc/ install -d -m0755 $(IDIR_ICECAST)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/icecast $(IDIR_ICECAST)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/icecast $(IDIR_ICECAST)/usr/bin/ install -d -m0755 $(IDIR_ICECAST)/usr/share/icecast - cp -fpR $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(IDIR_ICECAST)/usr/share/icecast/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/icecast/web $(IDIR_ICECAST)/usr/share/icecast/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(IDIR_ICECAST)/usr/share/icecast/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(IDIR_ICECAST)/usr/share/icecast/ $(RSTRIP) $(IDIR_ICECAST) $(IPKG_BUILD) $(IDIR_ICECAST) $(PACKAGE_DIR) diff --git a/package/icecast/patches/icecast-2.3.0-curl_config.patch b/package/icecast/patches/icecast-2.3.0-curl_config.patch index 22ab492ab7..eb9f46f2a1 100644 --- a/package/icecast/patches/icecast-2.3.0-curl_config.patch +++ b/package/icecast/patches/icecast-2.3.0-curl_config.patch @@ -10,7 +10,7 @@ diff -ruN icecast-2.3.0-old/aclocal.m4 icecast-2.3.0-new/aclocal.m4 -# serial 47 AC_PROG_LIBTOOL +# serial 46 AC_PROG_LIBTOOL -+# Debian $Rev: 189 $ ++# Debian $Rev$ - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index c40d800ec3..fd02bef87c 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -63,17 +63,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ID3LIB): install -d -m0755 $(IDIR_ID3LIB)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(IDIR_ID3LIB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(IDIR_ID3LIB)/usr/lib/ $(IPKG_BUILD) $(IDIR_ID3LIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libid3.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3.so $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libid3.so diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 870362aee4..21231d4c1c 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -63,8 +63,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPCAD): install -d -m0755 $(IDIR_IPCAD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/ipcad.conf $(IDIR_IPCAD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(IDIR_IPCAD)/etc/ install -d -m0755 $(IDIR_IPCAD)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ipcad $(IDIR_IPCAD)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ipcad $(IDIR_IPCAD)/usr/bin/ $(RSTRIP) $(IDIR_IPCAD) $(IPKG_BUILD) $(IDIR_IPCAD) $(PACKAGE_DIR) diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 53589dd9eb..dc12dc0f4d 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -63,7 +63,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPERF): install -d -m0755 $(IDIR_IPERF)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin $(RSTRIP) $(IDIR_IPERF) $(IPKG_BUILD) $(IDIR_IPERF) $(PACKAGE_DIR) diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile index 0a55827fb6..3dddcc5556 100644 --- a/package/ipkg/Makefile +++ b/package/ipkg/Makefile @@ -60,8 +60,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPKG): install -d -m0755 $(IDIR_IPKG)/bin - cp -fpR $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg + $(CP) $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg install -d -m0755 $(IDIR_IPKG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/ $(RSTRIP) $(IDIR_IPKG) $(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 5b30b81342..f0773e437d 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -36,13 +36,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IP): mkdir -p $(IDIR_IP)/usr/sbin - cp $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ $(STRIP) $(IDIR_IP)/usr/sbin/* $(IPKG_BUILD) $(IDIR_IP) $(PACKAGE_DIR) $(IPKG_TC): mkdir -p $(IDIR_TC)/usr/sbin - cp $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ $(STRIP) $(IDIR_TC)/usr/sbin/* $(IPKG_BUILD) $(IDIR_TC) $(PACKAGE_DIR) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 70b0627b52..06d49e9686 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -72,14 +72,14 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPSEC_TOOLS): install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc - cp -fpR $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ + $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ $(RSTRIP) $(IDIR_IPSEC_TOOLS) $(IPKG_BUILD) $(IDIR_IPSEC_TOOLS) $(PACKAGE_DIR) diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile index 269a109a77..dbf35c8f94 100644 --- a/package/iptables-snmp/Makefile +++ b/package/iptables-snmp/Makefile @@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPTABLES_SNMP): install -d -m0755 $(IDIR_IPTABLES_SNMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables-snmp.so $(IDIR_IPTABLES_SNMP)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables-snmp.so $(IDIR_IPTABLES_SNMP)/usr/lib $(RSTRIP) $(IDIR_IPTABLES_SNMP) $(IPKG_BUILD) $(IDIR_IPTABLES_SNMP) $(PACKAGE_DIR) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ed46df259e..1792fe37c6 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -22,7 +22,7 @@ define IPKG_plugin_template $$(IPKG_$(1)): install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ done @[ -z "$(3)" ] || $(MAKE) $(3) $(RSTRIP) $$(IDIR_$(1)) @@ -73,10 +73,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPTABLES): install -d -m0755 $(IDIR_IPTABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) @@ -86,29 +86,29 @@ $(IPKG_IPTABLES_EXTRA): $(IPKG_IPTABLES_UTILS): install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_IPTABLES_UTILS) $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR) $(IPKG_IP6TABLES): install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ + $(CP) libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IP6TABLES) $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ layer7-install: mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols - cp files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ + $(CP) files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ install-dev: $(STAGING_DIR)/usr/lib/libipq.a diff --git a/package/irssi/Makefile b/package/irssi/Makefile index fa70e148fb..bdf82a3047 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IRSSI): mkdir -p $(IDIR_IRSSI)/usr/bin - cp $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(IDIR_IRSSI)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(IDIR_IRSSI)/usr/bin/ $(STRIP) $(IDIR_IRSSI)/usr/bin/* $(IPKG_BUILD) $(IDIR_IRSSI) $(PACKAGE_DIR) diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index dbd2bd4ade..11fd017a4d 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -63,16 +63,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBJPEG): install -d -m0755 $(IDIR_LIBJPEG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(IDIR_LIBJPEG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(IDIR_LIBJPEG)/usr/lib/ $(RSTRIP) $(IDIR_LIBJPEG) $(IPKG_BUILD) $(IDIR_LIBJPEG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libjpeg.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libjpeg.so diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 58e3f501ad..5603a705e4 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -74,7 +74,7 @@ $(IPKG_KISMET_CLIENT): install -m0644 ./files/kismet.conf $(IDIR_KISMET_CLIENT)/etc/kismet/ install -m0644 ./files/kismet_ui.conf $(IDIR_KISMET_CLIENT)/etc/kismet/ install -d -m0755 $(IDIR_KISMET_CLIENT)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_CLIENT) $(IPKG_BUILD) $(IDIR_KISMET_CLIENT) $(PACKAGE_DIR) @@ -82,7 +82,7 @@ $(IPKG_KISMET_DRONE): install -d -m0755 $(IDIR_KISMET_DRONE)/etc/kismet/ install -m0644 ./files/kismet_drone.conf $(IDIR_KISMET_DRONE)/etc/kismet/ install -d -m0755 $(IDIR_KISMET_DRONE)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_DRONE) $(IPKG_BUILD) $(IDIR_KISMET_DRONE) $(PACKAGE_DIR) @@ -92,7 +92,7 @@ $(IPKG_KISMET_SERVER): install -m0644 ./files/client_manuf $(IDIR_KISMET_SERVER)/etc/kismet/ install -m0644 ./files/kismet.conf $(IDIR_KISMET_SERVER)/etc/kismet/ mkdir -p $(IDIR_KISMET_SERVER)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_SERVER) $(IPKG_BUILD) $(IDIR_KISMET_SERVER) $(PACKAGE_DIR) diff --git a/package/knock/Makefile b/package/knock/Makefile index 68293f102d..d8d6262e86 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -62,7 +62,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KNOCK): install -d -m0755 $(IDIR_KNOCK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/knock $(IDIR_KNOCK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/knock $(IDIR_KNOCK)/usr/bin/ $(RSTRIP) $(IDIR_KNOCK) $(IPKG_BUILD) $(IDIR_KNOCK) $(PACKAGE_DIR) @@ -70,6 +70,6 @@ $(IPKG_KNOCKD): install -d -m0755 $(IDIR_KNOCKD)/etc install -m0600 $(PKG_INSTALL_DIR)/etc/knockd.conf $(IDIR_KNOCKD)/etc/ install -d -m0755 $(IDIR_KNOCKD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/knockd $(IDIR_KNOCKD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(IDIR_KNOCKD)/usr/sbin/ $(RSTRIP) $(IDIR_KNOCKD) $(IPKG_BUILD) $(IDIR_KNOCKD) $(PACKAGE_DIR) diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index e138f51a9a..278ecdd297 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -33,10 +33,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_L2TPNS): install -d -m0755 $(IDIR_L2TPNS)/etc/l2tpns - cp -fpR $(PKG_INSTALL_DIR)/etc/l2tpns/* $(IDIR_L2TPNS)/etc/l2tpns/ + $(CP) $(PKG_INSTALL_DIR)/etc/l2tpns/* $(IDIR_L2TPNS)/etc/l2tpns/ install -d -m0755 $(IDIR_L2TPNS)/usr/lib/l2tpns - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(IDIR_L2TPNS)/usr/lib/l2tpns/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(IDIR_L2TPNS)/usr/lib/l2tpns/ install -d -m0755 $(IDIR_L2TPNS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_L2TPNS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_L2TPNS)/usr/sbin/ $(RSTRIP) $(IDIR_L2TPNS) $(IPKG_BUILD) $(IDIR_L2TPNS) $(PACKAGE_DIR) diff --git a/package/libamsel/Makefile b/package/libamsel/Makefile index 530582f3ce..0a32c73eaf 100644 --- a/package/libamsel/Makefile +++ b/package/libamsel/Makefile @@ -33,18 +33,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBAMSEL): install -d -m0755 $(IDIR_LIBAMSEL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_LIBAMSEL)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_LIBAMSEL)/usr/lib $(RSTRIP) $(IDIR_LIBAMSEL) $(IPKG_BUILD) $(IDIR_LIBAMSEL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libamsel.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/include/compat - cp -fpR $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libamsel.so install-dev: $(STAGING_DIR)/usr/lib/libamsel.so diff --git a/package/libao/Makefile b/package/libao/Makefile index 5df454c7c6..dee885ea2d 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -66,18 +66,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBAO): install -m0755 -d $(IDIR_LIBAO)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(IDIR_LIBAO)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(IDIR_LIBAO)/usr/lib/ $(RSTRIP) $(IDIR_LIBAO) $(IPKG_BUILD) $(IDIR_LIBAO) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libao.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc touch $@ diff --git a/package/libart/Makefile b/package/libart/Makefile index bbf2ead77c..558ff21235 100644 --- a/package/libart/Makefile +++ b/package/libart/Makefile @@ -59,19 +59,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBART): install -d -m0755 $(IDIR_LIBART)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(IDIR_LIBART)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(IDIR_LIBART)/usr/lib/ $(RSTRIP) $(IDIR_LIBART) $(IPKG_BUILD) $(IDIR_LIBART) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libart_lgpl_2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libart_lgpl_2.so diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index cefad8cbc3..308bf169c3 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -62,22 +62,22 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBAUDIOFILE): install -m0755 -d $(IDIR_LIBAUDIOFILE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(IDIR_LIBAUDIOFILE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(IDIR_LIBAUDIOFILE)/usr/lib/ $(RSTRIP) $(IDIR_LIBAUDIOFILE) $(IPKG_BUILD) $(IDIR_LIBAUDIOFILE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libaudiofile.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc touch $@ diff --git a/package/libcli/Makefile b/package/libcli/Makefile index 78fb0b6bf9..398ee092d2 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -31,15 +31,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBCLI): install -d -m0755 $(IDIR_LIBCLI)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcli* $(IDIR_LIBCLI)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli* $(IDIR_LIBCLI)/usr/lib $(RSTRIP) $(IDIR_LIBCLI) $(IPKG_BUILD) $(IDIR_LIBCLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcli.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libcli.so diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index 97fe890c89..272e8c2b75 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -63,18 +63,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDAEMON): install -d -m0755 $(IDIR_LIBDAEMON)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(IDIR_LIBDAEMON)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(IDIR_LIBDAEMON)/usr/lib/ $(RSTRIP) $(IDIR_LIBDAEMON) $(IPKG_BUILD) $(IDIR_LIBDAEMON) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdaemon.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc touch $@ diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 0fc8687b58..d2ecf93f1b 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -70,15 +70,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDB): install -m0755 -d $(IDIR_LIBDB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/ $(RSTRIP) $(IDIR_LIBDB) $(IPKG_BUILD) $(IDIR_LIBDB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdb.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libdb.so install-dev: $(STAGING_DIR)/usr/lib/libdb.so diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index bb48d4430d..d325a05335 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -66,20 +66,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDNET): install -m0755 -d $(IDIR_LIBDNET)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ install -m0755 -d $(IDIR_LIBDNET)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ $(RSTRIP) $(IDIR_LIBDNET) $(IPKG_BUILD) $(IDIR_LIBDNET) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdnet.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libdnet.so diff --git a/package/libelf/Makefile b/package/libelf/Makefile index f6fd702c49..29057b74f4 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -67,15 +67,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBELF): install -d -m0755 $(IDIR_LIBELF)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ $(RSTRIP) $(IDIR_LIBELF) $(IPKG_BUILD) $(IDIR_LIBELF) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libelf.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libelf.so diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 7d4d56f13d..487fe559a1 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -59,16 +59,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBEVENT): install -d -m0755 $(IDIR_LIBEVENT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(IDIR_LIBEVENT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(IDIR_LIBEVENT)/usr/lib/ $(RSTRIP) $(IDIR_LIBEVENT) $(IPKG_BUILD) $(IDIR_LIBEVENT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libevent.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libevent.so diff --git a/package/libffi-sable/Makefile b/package/libffi-sable/Makefile index 26bd2d9db8..402ce56f9e 100644 --- a/package/libffi-sable/Makefile +++ b/package/libffi-sable/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFFI_SABLE): install -m0755 -d $(IDIR_LIBFFI_SABLE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFFI_SABLE) $(IPKG_BUILD) $(IDIR_LIBFFI_SABLE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libffi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libffi.so diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 6a3028797a..bf35eef234 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -62,19 +62,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGCRYPT): install -m0755 -d $(IDIR_LIBGCRYPT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/ $(RSTRIP) $(IDIR_LIBGCRYPT) $(IPKG_BUILD) $(IDIR_LIBGCRYPT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgcrypt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgcrypt.so diff --git a/package/libgd/Makefile b/package/libgd/Makefile index aedb0af117..0d31287df0 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -67,18 +67,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGD): install -d -m0755 $(IDIR_LIBGD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(IDIR_LIBGD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(IDIR_LIBGD)/usr/lib/ $(RSTRIP) $(IDIR_LIBGD) $(IPKG_BUILD) $(IDIR_LIBGD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgd.so diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile index dd8ddce1a3..9611e843ad 100644 --- a/package/libgdbm/Makefile +++ b/package/libgdbm/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGDBM): $(STAGING_DIR)/usr/lib/libgdbm.so install -m0755 -d $(IDIR_LIBGDBM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(IDIR_LIBGDBM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(IDIR_LIBGDBM)/usr/lib/ $(RSTRIP) $(IDIR_LIBGDBM) $(IPKG_BUILD) $(IDIR_LIBGDBM) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgdbm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libgdbm.so install-dev: $(STAGING_DIR)/usr/lib/libgdbm.so diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 6b34bb5e69..eb127d3f17 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -63,19 +63,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGPG_ERROR): install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/ $(RSTRIP) $(IDIR_LIBGPG_ERROR) $(IPKG_BUILD) $(IDIR_LIBGPG_ERROR) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgpg-error.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgpg-error.so diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 42c9e68624..b4281652c4 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -63,16 +63,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBID3TAG): install -m0755 -d $(IDIR_LIBID3TAG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/ $(RSTRIP) $(IDIR_LIBID3TAG) $(IPKG_BUILD) $(IDIR_LIBID3TAG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libid3tag.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libid3tag.so diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index dddc3ce885..60b3710c99 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBLZO): install -d -m0755 $(IDIR_LIBLZO)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib $(RSTRIP) $(IDIR_LIBLZO) $(IPKG_BUILD) $(IDIR_LIBLZO) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/liblzo.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/liblzo.so install-dev: $(STAGING_DIR)/usr/lib/liblzo.so diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 251f9834af..91983eac53 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -74,16 +74,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBMAD): install -m0755 -d $(IDIR_LIBMAD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/ $(RSTRIP) $(IDIR_LIBMAD) $(IPKG_BUILD) $(IDIR_LIBMAD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libmad.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libmad.so diff --git a/package/libnet/Makefile b/package/libnet/Makefile index cb6e29e04d..4e89b35411 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -75,17 +75,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNET): install -m0755 -d $(IDIR_LIBNET)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ $(RSTRIP) $(IDIR_LIBNET) $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libnet.so diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 3748e93e09..c7e271e5ef 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNIDS): install -m0755 -d $(IDIR_LIBNIDS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(IDIR_LIBNIDS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(IDIR_LIBNIDS)/usr/lib/ $(RSTRIP) $(IDIR_LIBNIDS) $(IPKG_BUILD) $(IDIR_LIBNIDS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnids.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libnids.so install-dev: $(STAGING_DIR)/usr/lib/libnids.so diff --git a/package/libogg/Makefile b/package/libogg/Makefile index 6fe529b816..4459aa25f3 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -62,18 +62,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOGG): install -m0755 -d $(IDIR_LIBOGG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/ $(RSTRIP) $(IDIR_LIBOGG) $(IPKG_BUILD) $(IDIR_LIBOGG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libogg.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc touch $@ diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 6fbb73363a..bacf072872 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -65,17 +65,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOSIP2): install -m0755 -d $(IDIR_LIBOSIP2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/ $(RSTRIP) $(IDIR_LIBOSIP2) $(IPKG_BUILD) $(IDIR_LIBOSIP2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libosip2.so diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 42bac46909..670bca0cdb 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -65,15 +65,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPCAP): install -m0755 -d $(IDIR_LIBPCAP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCAP) $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libpcap.so install-dev: $(STAGING_DIR)/usr/lib/libpcap.so diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 228255c301..8033d42c41 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -60,20 +60,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPNG): install -d -m0755 $(IDIR_LIBPNG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/ $(RSTRIP) $(IDIR_LIBPNG) $(IPKG_BUILD) $(IDIR_LIBPNG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config touch $@ diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index ad8f44e20d..7e6b8d42e1 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -25,8 +25,8 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBPTHREAD): $(PKG_BUILD_DIR)/.built mkdir -p $(IDIR_LIBPTHREAD)/lib - cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ - cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ + $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ + $(CP) $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ $(RSTRIP) $(IDIR_LIBPTHREAD) $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR) diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 97a7caef4d..9402aa53a9 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -70,19 +70,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBTASN1): install -m0755 -d $(IDIR_LIBTASN1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/ $(RSTRIP) $(IDIR_LIBTASN1) $(IPKG_BUILD) $(IDIR_LIBTASN1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libtasn1.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libtasn1.so diff --git a/package/libtool/Makefile b/package/libtool/Makefile index b5926aa0bc..f84d1711ee 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -57,15 +57,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBLTDL): install -m0755 -d $(IDIR_LIBLTDL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ $(RSTRIP) $(IDIR_LIBLTDL) $(IPKG_BUILD) $(IDIR_LIBLTDL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ mkdir -p $(I_LIBLTDL_DEV)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libltdl.so diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index d09f60d64a..6e862722e6 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -30,19 +30,19 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBUPNP): install -m0755 -d $(IDIR_LIBUPNP)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \ $(RSTRIP) $(IDIR_LIBUPNP) $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/upnp - cp -fpR $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ + $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libupnp.so diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 55af3d6215..e6cf4ba2bb 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -61,17 +61,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBUSB): install -m0755 -d $(IDIR_LIBUSB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/ $(RSTRIP) $(IDIR_LIBUSB) $(IPKG_BUILD) $(IDIR_LIBUSB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libusb.so diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 204d137ecf..ec36018f1c 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -70,18 +70,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBVORBIS): install -m0755 -d $(IDIR_LIBVORBIS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.so.* $(IDIR_LIBVORBIS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis.so.* $(IDIR_LIBVORBIS)/usr/lib/ $(RSTRIP) $(IDIR_LIBVORBIS) $(IPKG_BUILD) $(IDIR_LIBVORBIS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libvorbis.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/vorbis $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/vorbis $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis{,enc,file}.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis{,enc,file}.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc touch $@ diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile index 4c1fc0bcbe..d668a0e9b7 100644 --- a/package/libvorbisidec/Makefile +++ b/package/libvorbisidec/Makefile @@ -62,16 +62,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBVORBISIDEC): install -m0755 -d $(IDIR_LIBVORBISIDEC)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(IDIR_LIBVORBISIDEC)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(IDIR_LIBVORBISIDEC)/usr/lib/ $(RSTRIP) $(IDIR_LIBVORBISIDEC) $(IPKG_BUILD) $(IDIR_LIBVORBISIDEC) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libvorbisidec.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libvorbisidec.so diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index d349caa7df..c08d5fe8b2 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -89,19 +89,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBXML2): install -m0755 -d $(IDIR_LIBXML2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/ $(RSTRIP) $(IDIR_LIBXML2) $(IPKG_BUILD) $(IDIR_LIBXML2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libxml2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xml2-config diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 91738fc1c8..dc6544810f 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -70,19 +70,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBXSLT): install -m0755 -d $(IDIR_LIBXSLT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(IDIR_LIBXSLT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(IDIR_LIBXSLT)/usr/lib/ $(RSTRIP) $(IDIR_LIBXSLT) $(IPKG_BUILD) $(IDIR_LIBXSLT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libxslt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libxslt $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/bin/xslt-config diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 401895c388..97fa3610ad 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -122,10 +122,10 @@ $(IPKG_LIGHTTPD): install -m0755 ./files/lighttpd.init $(IDIR_LIGHTTPD)/etc/init.d/lighttpd install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd for m in dirlisting indexfile staticfile; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ done install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ $(RSTRIP) $(IDIR_LIGHTTPD) $(IPKG_BUILD) $(IDIR_LIGHTTPD) $(PACKAGE_DIR) diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 3c7bf9c5b5..93da3afcd4 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -56,13 +56,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LINUX_ATM): install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib - cp $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib $(RSTRIP) $(IDIR_LINUX_ATM)/ $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR) $(IPKG_BR2684CTL): install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/ install -d -m0755 $(IDIR_BR2684CTL)/etc/hotplug.d/net install -m0644 ./files/br2684.init $(IDIR_BR2684CTL)/etc/hotplug.d/net/30-br2684 $(RSTRIP) $(IDIR_BR2684CTL)/ @@ -70,9 +70,9 @@ $(IPKG_BR2684CTL): $(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libatm.so diff --git a/package/linux-atm/patches/300-no_autotools.patch b/package/linux-atm/patches/300-no_autotools.patch index 57f8ecb897..a085eca7db 100644 --- a/package/linux-atm/patches/300-no_autotools.patch +++ b/package/linux-atm/patches/300-no_autotools.patch @@ -836,7 +836,7 @@ diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4 -# serial 46 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL -+# Debian $Rev: 214 $ ++# Debian $Rev$ + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile index 3a399c9a35..bc4fb112bf 100644 --- a/package/lrzsz/Makefile +++ b/package/lrzsz/Makefile @@ -59,8 +59,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LRZSZ): install -d -m0755 $(IDIR_LRZSZ)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lrz $(IDIR_LRZSZ)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lsz $(IDIR_LRZSZ)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lrz $(IDIR_LRZSZ)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lsz $(IDIR_LRZSZ)/usr/bin/ (cd $(IDIR_LRZSZ)/usr/bin; \ ln -fs lrz lrx; \ ln -fs lrz lrb; \ diff --git a/package/lua/Makefile b/package/lua/Makefile index 4896006f97..ae6d085cf9 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -57,19 +57,19 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBLUA): install -d -m0755 $(IDIR_LIBLUA)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ $(RSTRIP) $(IDIR_LIBLUA) $(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR) $(IPKG_LUA): install -d -m0755 $(IDIR_LUA)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/ $(RSTRIP) $(IDIR_LUA) $(IPKG_BUILD) $(IDIR_LUA) $(PACKAGE_DIR) $(IPKG_LUAC): install -d -m0755 $(IDIR_LUAC)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/ $(RSTRIP) $(IDIR_LUAC) $(IPKG_BUILD) $(IDIR_LUAC) $(PACKAGE_DIR) @@ -82,10 +82,10 @@ $(IPKG_LUA_EXAMPLES): $(STAGING_DIR)/usr/lib/liblua.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/liblua.so diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile index aaa74eb194..75cbb9c8db 100755 --- a/package/macchanger/Makefile +++ b/package/macchanger/Makefile @@ -47,6 +47,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MACCHANGER): mkdir -p $(IDIR_MACCHANGER) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_MACCHANGER)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_MACCHANGER)/ $(RSTRIP) $(IDIR_MACCHANGER) $(IPKG_BUILD) $(IDIR_MACCHANGER) $(PACKAGE_DIR) diff --git a/package/maradns/Makefile b/package/maradns/Makefile index 9ebf32d9f5..4625ed7c46 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -66,8 +66,8 @@ $(IPKG_MARADNS): install -d -m0755 $(IDIR_MARADNS)/etc/init.d install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns install -d -m0755 $(IDIR_MARADNS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/ install -d -m0755 $(IDIR_MARADNS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/ $(RSTRIP) $(IDIR_MARADNS) $(IPKG_BUILD) $(IDIR_MARADNS) $(PACKAGE_DIR) diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile index dcb8214529..89bd39a92c 100644 --- a/package/matrixssl/Makefile +++ b/package/matrixssl/Makefile @@ -29,16 +29,16 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBMATRIXSSL): install -d -m0755 $(IDIR_LIBMATRIXSSL)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/ $(RSTRIP) $(IDIR_LIBMATRIXSSL) $(IPKG_BUILD) $(IDIR_LIBMATRIXSSL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/matrixSsl - cp -fpR $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl + $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib install-dev: $(STAGING_DIR)/usr/lib/libmatrixssl.so diff --git a/package/microcom/Makefile b/package/microcom/Makefile index 493f57ddf4..ebd7ddffec 100644 --- a/package/microcom/Makefile +++ b/package/microcom/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.prepared: touch $@ $(PKG_BUILD_DIR)/.configured: - cp $(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile.tmp + $(CP) $(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile.tmp sed 's~gcc~$$(CC)~' $(PKG_BUILD_DIR)/Makefile.tmp > $(PKG_BUILD_DIR)/Makefile touch $@ diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 2261b54cd6..053ac9116b 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,$(PKG_VERSION)- $(PKG_BUILD_DIR)/.configured: - cp -f ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/ + $(CP) ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 17c28f68f2..4b9837663e 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -71,21 +71,21 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MIREDO): install -d -m0755 $(IDIR_MIREDO)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(IDIR_MIREDO)/etc/miredo.conf + $(CP) $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(IDIR_MIREDO)/etc/miredo.conf install -d -m0755 $(IDIR_MIREDO)/etc/init.d install -m0755 ./files/miredo.init $(IDIR_MIREDO)/etc/init.d/miredo install -d -m0755 $(IDIR_MIREDO)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/miredo $(IDIR_MIREDO)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(IDIR_MIREDO)/usr/sbin/ $(RSTRIP) $(IDIR_MIREDO) $(IPKG_BUILD) $(IDIR_MIREDO) $(PACKAGE_DIR) $(IPKG_MIREDO_SERVER): install -d -m0755 $(IDIR_MIREDO_SERVER)/etc/ - cp -fpR $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(IDIR_MIREDO_SERVER)/etc/miredo-server.conf + $(CP) $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(IDIR_MIREDO_SERVER)/etc/miredo-server.conf install -d -m0755 $(IDIR_MIREDO_SERVER)/etc/init.d install -m0755 ./files/miredo-server.init $(IDIR_MIREDO_SERVER)/etc/init.d/miredo-server install -d -m0755 $(IDIR_MIREDO_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(IDIR_MIREDO_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(IDIR_MIREDO_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_MIREDO_SERVER) $(IPKG_BUILD) $(IDIR_MIREDO_SERVER) $(PACKAGE_DIR) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 71775379fb..1e97df4963 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -102,8 +102,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MPD): install -d -m0755 $(IDIR_MPD)/usr/bin install -d -m0755 $(IDIR_MPD)/etc - cp -fp $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin - cp -fp $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin + $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf echo "Depends: $(PKG_DEPENDS)" >> $(IDIR_MPD)/CONTROL/control $(RSTRIP) $(IDIR_MPD) $(IPKG_BUILD) $(IDIR_MPD) $(PACKAGE_DIR) diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 723e7b03c2..8b6ab7039e 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -39,6 +39,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MRD6): mkdir -p $(IDIR_MRD6)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/ $(IDIR_MRD6)/ + $(CP) $(PKG_INSTALL_DIR)/ $(IDIR_MRD6)/ $(RSTRIP) $(IDIR_MRD6)/ $(IPKG_BUILD) $(IDIR_MRD6) $(PACKAGE_DIR) diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 7a2ab9b43f..fb07500863 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -73,9 +73,9 @@ $(IPKG_MT_DAAPD): install -m0755 -d $(IDIR_MT_DAAPD)/etc/init.d install -m0755 ./files/mt-daapd.init $(IDIR_MT_DAAPD)/etc/init.d/mt-daapd install -m0755 -d $(IDIR_MT_DAAPD)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(IDIR_MT_DAAPD)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(IDIR_MT_DAAPD)/usr/share/ install -m0755 -d $(IDIR_MT_DAAPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(IDIR_MT_DAAPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(IDIR_MT_DAAPD)/usr/sbin/ $(RSTRIP) $(IDIR_MT_DAAPD) $(IPKG_BUILD) $(IDIR_MT_DAAPD) $(PACKAGE_DIR) diff --git a/package/mtr/Makefile b/package/mtr/Makefile index f49f2ed869..f0885624bb 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -68,7 +68,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MTR): install -d -m0755 $(IDIR_MTR)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/ $(RSTRIP) $(IDIR_MTR) $(IPKG_BUILD) $(IDIR_MTR) $(PACKAGE_DIR) diff --git a/package/mysql/Makefile b/package/mysql/Makefile index ab8d6e5006..ad6b5297be 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -107,17 +107,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBMYSQLCLIENT): install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ $(RSTRIP) $(IDIR_LIBMYSQLCLIENT) $(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/ rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la touch $@ diff --git a/package/nano/Makefile b/package/nano/Makefile index 5ecad7ec43..aec6fa8e62 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -66,7 +66,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NANO): install -d -m0755 $(IDIR_NANO)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nano $(IDIR_NANO)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nano $(IDIR_NANO)/usr/bin/ $(RSTRIP) $(IDIR_NANO) $(IPKG_BUILD) $(IDIR_NANO) $(PACKAGE_DIR) diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 39674bfd9e..4223b8033b 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -115,11 +115,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNCURSES): install -d -m0755 $(IDIR_LIBNCURSES)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \ install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo/`dirname $${f}`; \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \ $(IDIR_LIBNCURSES)/usr/share/terminfo/$${f}; \ done $(RSTRIP) $(IDIR_LIBNCURSES) @@ -127,15 +127,15 @@ $(IPKG_LIBNCURSES): $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libncurses.so diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 0b4914d6c8..25a1cc6d1b 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -150,7 +150,7 @@ endif $(IPKG_LIBNETSNMP): install -d -m0755 $(IDIR_LIBNETSNMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/ $(RSTRIP) $(IDIR_LIBNETSNMP) $(IPKG_BUILD) $(IDIR_LIBNETSNMP) $(PACKAGE_DIR) @@ -180,17 +180,17 @@ $(IPKG_SNMPD_STATIC): $(IPKG_SNMP_UTILS): install -d -m0755 $(IDIR_SNMP_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_SNMP_UTILS) $(IPKG_BUILD) $(IDIR_SNMP_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libnetsnmp.so diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index a6fa4e8842..3e0ab204c7 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NETSTAT-NAT): install -d -m0755 $(IDIR_NETSTAT-NAT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(IDIR_NETSTAT-NAT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(IDIR_NETSTAT-NAT)/usr/bin/ $(RSTRIP) $(IDIR_NETSTAT-NAT) $(IPKG_BUILD) $(IDIR_NETSTAT-NAT) $(PACKAGE_DIR) diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 659bff9580..23997b88fe 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -67,10 +67,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NMAP): install -d -m0755 $(IDIR_NMAP)/usr/share/nmap for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \ done install -d -m0755 $(IDIR_NMAP)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/ $(RSTRIP) $(IDIR_NMAP) $(IPKG_BUILD) $(IDIR_NMAP) $(PACKAGE_DIR) diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile index 8820413e4d..4d2120e776 100644 --- a/package/nocatsplash/Makefile +++ b/package/nocatsplash/Makefile @@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NOCATSPLASH): mkdir -p $(IDIR_NOCATSPLASH) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_NOCATSPLASH)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_NOCATSPLASH)/ $(RSTRIP) $(IDIR_NOCATSPLASH) $(IPKG_BUILD) $(IDIR_NOCATSPLASH) $(PACKAGE_DIR) diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 3e4c2d3fe8..dd460fc06d 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -a ./src/* $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR) touch $@ $(PKG_BUILD_DIR)/.configured: @@ -27,9 +27,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NVRAM): mkdir -p $(IDIR_NVRAM)/usr/lib - cp $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib + $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib mkdir -p $(IDIR_NVRAM)/usr/sbin - cp $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin $(RSTRIP) $(IDIR_NVRAM) $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR) @@ -37,6 +37,6 @@ $(IPKG_NVRAM): compile-targets: install-dev install-dev: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/lib - cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 0c427a32ed..a5092c8758 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -61,9 +61,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OLSRD): install -d -m0755 $(IDIR_OLSRD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/ install -d -m0755 $(IDIR_OLSRD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/ install -d -m0755 $(IDIR_OLSRD)/etc/init.d install -m0755 ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/S60olsrd $(RSTRIP) $(IDIR_OLSRD) @@ -73,4 +73,4 @@ $(IPKG_OLSRD_MOD_SECURE): $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key: install -d -m0755 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d - cp -fpR ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/ + $(CP) ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/ diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index c313c49d22..c40b0c24eb 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -71,17 +71,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENCDK): install -m0755 -d $(IDIR_LIBOPENCDK)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/ $(RSTRIP) $(IDIR_LIBOPENCDK) $(IPKG_BUILD) $(IDIR_LIBOPENCDK) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libopencdk.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libopencdk.so diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 5909ee530f..5eac5807e8 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -109,25 +109,25 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENLDAP): mkdir -p $(IDIR_LIBOPENLDAP)/etc/openldap - cp -fpR $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(IDIR_LIBOPENLDAP)/etc/openldap/ + $(CP) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(IDIR_LIBOPENLDAP)/etc/openldap/ mkdir -p $(IDIR_LIBOPENLDAP)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(IDIR_LIBOPENLDAP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(IDIR_LIBOPENLDAP)/usr/lib/ mkdir -p $(IDIR_LIBOPENLDAP)/usr/share/openldap - cp -fpR $(PKG_INSTALL_DIR)/usr/share/openldap/* $(IDIR_LIBOPENLDAP)/usr/share/openldap/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/openldap/* $(IDIR_LIBOPENLDAP)/usr/share/openldap/ $(RSTRIP) $(IDIR_LIBOPENLDAP) $(IPKG_BUILD) $(IDIR_LIBOPENLDAP) $(PACKAGE_DIR) $(IPKG_OPENLDAP_UTILS): mkdir -p $(IDIR_OPENLDAP_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ldap* $(IDIR_OPENLDAP_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(IDIR_OPENLDAP_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_OPENLDAP_UTILS) $(IPKG_BUILD) $(IDIR_OPENLDAP_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libldap.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libldap.so diff --git a/package/openser/Makefile b/package/openser/Makefile index 29d72864f5..d3b482678f 100644 --- a/package/openser/Makefile +++ b/package/openser/Makefile @@ -42,17 +42,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENSER): mkdir -p $(IDIR_OPENSER)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_OPENSER)/usr/sbin/ - cp -fpR $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(IDIR_OPENSER)/usr/sbin/openser_gen_ha1 - cp -fpR $(PKG_BUILD_DIR)/scripts/sc $(IDIR_OPENSER)/usr/sbin/openserctl + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_OPENSER)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(IDIR_OPENSER)/usr/sbin/openser_gen_ha1 + $(CP) $(PKG_BUILD_DIR)/scripts/sc $(IDIR_OPENSER)/usr/sbin/openserctl chmod 744 $(IDIR_OPENSER)/usr/sbin/openserctl - cp -fpR $(PKG_BUILD_DIR)/scripts/sc.dbtext $(IDIR_OPENSER)/usr/sbin/dbtextctl + $(CP) $(PKG_BUILD_DIR)/scripts/sc.dbtext $(IDIR_OPENSER)/usr/sbin/dbtextctl chmod 744 $(IDIR_OPENSER)/usr/sbin/dbtextctl mkdir -p $(IDIR_OPENSER)/usr/lib/openser/modules (cd $(PKG_BUILD_DIR);\ - cp -a $(OPENSER_MODULE_FILES) $(IDIR_OPENSER)/usr/lib/openser/modules/; \ + $(CP) $(OPENSER_MODULE_FILES) $(IDIR_OPENSER)/usr/lib/openser/modules/; \ ) mkdir -p $(IDIR_OPENSER)/etc/openser - cp -fpR $(PKG_BUILD_DIR)/etc/openser.cfg $(IDIR_OPENSER)/etc/openser/ + $(CP) $(PKG_BUILD_DIR)/etc/openser.cfg $(IDIR_OPENSER)/etc/openser/ $(RSTRIP) $(IDIR_OPENSER) $(IPKG_BUILD) $(IDIR_OPENSER) $(PACKAGE_DIR) diff --git a/package/openssh/Makefile b/package/openssh/Makefile index c0d296d230..1dca669fe1 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -81,42 +81,42 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENSSH_CLIENT): install -m0700 -d $(IDIR_OPENSSH_CLIENT)/etc/ssh - cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(IDIR_OPENSSH_CLIENT)/etc/ssh/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(IDIR_OPENSSH_CLIENT)/etc/ssh/ install -m0755 -d $(IDIR_OPENSSH_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/scp $(IDIR_OPENSSH_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(IDIR_OPENSSH_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_CLIENT) $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT) $(PACKAGE_DIR) $(IPKG_OPENSSH_CLIENT_UTILS): install -m0755 -d $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_CLIENT_UTILS) $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT_UTILS) $(PACKAGE_DIR) $(IPKG_OPENSSH_SERVER): install -m0700 -d $(IDIR_OPENSSH_SERVER)/etc/ssh - cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/etc/init.d install -m0755 ./files/S50sshd $(IDIR_OPENSSH_SERVER)/etc/init.d/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_OPENSSH_SERVER) $(IPKG_BUILD) $(IDIR_OPENSSH_SERVER) $(PACKAGE_DIR) $(IPKG_OPENSSH_SFTP_CLIENT): install -m0755 -d $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sftp $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_SFTP_CLIENT) $(IPKG_BUILD) $(IDIR_OPENSSH_SFTP_CLIENT) $(PACKAGE_DIR) $(IPKG_OPENSSH_SFTP_SERVER): install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib/ install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec ln -sf ../lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec/sftp-server $(RSTRIP) $(IDIR_OPENSSH_SFTP_SERVER) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f822e9ad54..bc8b43c1dd 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -63,26 +63,26 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENSSL): install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/* $(RSTRIP) $(IDIR_LIBOPENSSL) $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR) $(IPKG_OPENSSL_UTIL): install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl - cp -fpR $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSL_UTIL) $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libssl.so diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 037cb0d73f..a34bf4436c 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -81,7 +81,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENVPN): install -d -m0755 $(IDIR_OPENVPN)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ $(RSTRIP) $(IDIR_OPENVPN) echo "Depends: $(PKG_DEPEND)" >> $(IDIR_OPENVPN)/CONTROL/control $(IPKG_BUILD) $(IDIR_OPENVPN) $(PACKAGE_DIR) diff --git a/package/osiris/Makefile b/package/osiris/Makefile index ba0db6c22f..54a4a99c14 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -68,6 +68,6 @@ $(IPKG_OSIRISD): install -d -m0755 $(IDIR_OSIRISD)/etc/init.d install -m0755 ./files/osirisd.init $(IDIR_OSIRISD)/etc/init.d/osirisd install -d -m0755 $(IDIR_OSIRISD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/ $(RSTRIP) $(IDIR_OSIRISD) $(IPKG_BUILD) $(IDIR_OSIRISD) $(PACKAGE_DIR) diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index 917b0fa020..491e6e5193 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -33,7 +33,7 @@ $(IPKG_P910ND): install -m0755 ./files/p910nd.init $(IDIR_P910ND)/etc/init.d/p910nd install -d -m0755 $(IDIR_P910ND)/usr/sbin ln -sf p910nd $(IDIR_P910ND)/etc/init.d/S$(PKG_INIT_PRIO)p910nd - cp -fpR $(PKG_BUILD_DIR)/p910nd $(IDIR_P910ND)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/p910nd $(IDIR_P910ND)/usr/sbin $(RSTRIP) $(IDIR_P910ND) $(IPKG_BUILD) $(IDIR_P910ND) $(PACKAGE_DIR) diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 6318344560..b77618242e 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -29,7 +29,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PCIUTILS): install -d -m0755 $(IDIR_PCIUTILS)/usr/sbin install -d -m0755 $(IDIR_PCIUTILS)/usr/share - cp -fpR $(PKG_BUILD_DIR)/{lspci,setpci} $(IDIR_PCIUTILS)/usr/sbin/ - cp -fpR $(PKG_BUILD_DIR)/pci.ids $(IDIR_PCIUTILS)/usr/share/ + $(CP) $(PKG_BUILD_DIR)/{lspci,setpci} $(IDIR_PCIUTILS)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/pci.ids $(IDIR_PCIUTILS)/usr/share/ $(RSTRIP) $(IDIR_PCIUTILS)/ $(IPKG_BUILD) $(IDIR_PCIUTILS) $(PACKAGE_DIR) diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index cc74db1f58..b99633a5fa 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -47,10 +47,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PCMCIA_UTILS): install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_PCMCIA_UTILS) $(IPKG_BUILD) $(IDIR_PCMCIA_UTILS) $(PACKAGE_DIR) diff --git a/package/pcre/Makefile b/package/pcre/Makefile index b24d7d8a2a..3cd030481b 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -67,17 +67,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPCRE): install -d -m0755 $(IDIR_LIBPCRE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCRE) $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpcre.so diff --git a/package/peercast/Makefile b/package/peercast/Makefile index 575a4041a9..36d78163d0 100644 --- a/package/peercast/Makefile +++ b/package/peercast/Makefile @@ -64,9 +64,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PEERCAST): install -m0755 -d $(IDIR_PEERCAST)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/peercast $(IDIR_PEERCAST)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(IDIR_PEERCAST)/usr/sbin/ install -m0755 -d $(IDIR_PEERCAST)/usr/share/peercast/html - cp -fpR $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(IDIR_PEERCAST)/usr/share/peercast/html/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(IDIR_PEERCAST)/usr/share/peercast/html/ install -m0755 -d $(IDIR_PEERCAST)/etc install -m0644 ./files/peercast.ini $(IDIR_PEERCAST)/etc/ install -m0755 -d $(IDIR_PEERCAST)/etc/init.d diff --git a/package/peerguardian/Makefile b/package/peerguardian/Makefile index ee34f07396..1410494ae0 100755 --- a/package/peerguardian/Makefile +++ b/package/peerguardian/Makefile @@ -49,6 +49,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PEERGUARDIAN): mkdir -p $(IDIR_PEERGUARDIAN) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_PEERGUARDIAN)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_PEERGUARDIAN)/ $(RSTRIP) $(IDIR_PEERGUARDIAN)/ $(IPKG_BUILD) $(IDIR_PEERGUARDIAN) $(PACKAGE_DIR) diff --git a/package/php4/Makefile b/package/php4/Makefile index 2644aa4451..cd42c1a7cb 100644 --- a/package/php4/Makefile +++ b/package/php4/Makefile @@ -263,7 +263,7 @@ $(IPKG_PHP4_CLI): install -m0755 -d $(IDIR_PHP4_CLI)/etc install -m0644 ./files/php.ini $(IDIR_PHP4_CLI)/etc/ install -m0755 -d $(IDIR_PHP4_CLI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php $(RSTRIP) $(IDIR_PHP4_CLI) $(IPKG_BUILD) $(IDIR_PHP4_CLI) $(PACKAGE_DIR) @@ -271,7 +271,7 @@ $(IPKG_PHP4_CGI): install -m0755 -d $(IDIR_PHP4_CGI)/etc install -m0644 ./files/php.ini $(IDIR_PHP4_CGI)/etc/ install -m0755 -d $(IDIR_PHP4_CGI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php $(RSTRIP) $(IDIR_PHP4_CGI) $(IPKG_BUILD) $(IDIR_PHP4_CGI) $(PACKAGE_DIR) @@ -281,7 +281,7 @@ $(IPKG_PHP4_FASTCGI): install -m0755 -d $(IDIR_PHP4_FASTCGI)/etc/init.d install -m0755 ./files/php.init $(IDIR_PHP4_FASTCGI)/etc/init.d/php install -m0755 -d $(IDIR_PHP4_FASTCGI)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php + $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php $(RSTRIP) $(IDIR_PHP4_FASTCGI) $(IPKG_BUILD) $(IDIR_PHP4_FASTCGI) $(PACKAGE_DIR) diff --git a/package/php5/Makefile b/package/php5/Makefile index db863ae4a5..bc48855d45 100644 --- a/package/php5/Makefile +++ b/package/php5/Makefile @@ -267,7 +267,7 @@ $(IPKG_PHP5_CLI): install -m0755 -d $(IDIR_PHP5_CLI)/etc install -m0644 ./files/php.ini $(IDIR_PHP5_CLI)/etc/ install -m0755 -d $(IDIR_PHP5_CLI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php $(RSTRIP) $(IDIR_PHP5_CLI) $(IPKG_BUILD) $(IDIR_PHP5_CLI) $(PACKAGE_DIR) @@ -275,7 +275,7 @@ $(IPKG_PHP5_CGI): install -m0755 -d $(IDIR_PHP5_CGI)/etc install -m0644 ./files/php.ini $(IDIR_PHP5_CGI)/etc/ install -m0755 -d $(IDIR_PHP5_CGI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php $(RSTRIP) $(IDIR_PHP5_CGI) $(IPKG_BUILD) $(IDIR_PHP5_CGI) $(PACKAGE_DIR) @@ -285,7 +285,7 @@ $(IPKG_PHP5_FASTCGI): install -m0755 -d $(IDIR_PHP5_FASTCGI)/etc/init.d install -m0755 ./files/php.init $(IDIR_PHP5_FASTCGI)/etc/init.d/php install -m0755 -d $(IDIR_PHP5_FASTCGI)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php + $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php $(RSTRIP) $(IDIR_PHP5_FASTCGI) $(IPKG_BUILD) $(IDIR_PHP5_FASTCGI) $(PACKAGE_DIR) diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index 5ec35b9956..fe2219d9f5 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,PIPACS,pipacs,$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -a ./src/* $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR) touch $@ $(PKG_BUILD_DIR)/.configured: diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index 04e75366d5..4a86c3ae9d 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -161,6 +161,6 @@ $(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS) $(IPKG_PMACCT_CLIENT): install -d -m0755 $(IDIR_PMACCT_CLIENT)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/pmacct $(IDIR_PMACCT_CLIENT)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/pmacct $(IDIR_PMACCT_CLIENT)/usr/sbin/ $(RSTRIP) $(IDIR_PMACCT_CLIENT) $(IPKG_BUILD) $(IDIR_PMACCT_CLIENT) $(PACKAGE_DIR) diff --git a/package/popt/Makefile b/package/popt/Makefile index 2dec25bbb6..75ea1a082d 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -59,15 +59,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPOPT): install -d -m0755 $(IDIR_LIBPOPT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ $(RSTRIP) $(IDIR_LIBPOPT) $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libpopt.so install-dev: $(STAGING_DIR)/usr/lib/libpopt.so diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 12452596e3..18cfec71e6 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -27,8 +27,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PORTSENTRY): mkdir -p $(IDIR_PORTSENTRY)/usr/bin mkdir -p $(IDIR_PORTSENTRY)/etc - cp $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(IDIR_PORTSENTRY)/etc/ - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_PORTSENTRY)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(IDIR_PORTSENTRY)/etc/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_PORTSENTRY)/usr/bin/ $(STRIP) $(IDIR_PORTSENTRY)/usr/bin/* $(IPKG_BUILD) $(IDIR_PORTSENTRY) $(PACKAGE_DIR) diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 5f269b1b9b..2cb3f6d0e3 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -88,27 +88,27 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPQ): install -d -m0755 $(IDIR_LIBPQ)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ $(RSTRIP) $(IDIR_LIBPQ) $(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR) $(IPKG_PGSQL_CLI): install -d -m0755 $(IDIR_PGSQL_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/ $(RSTRIP) $(IDIR_PGSQL_CLI) $(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpq.so diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 56a9afb245..4a0b0537ad 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -116,19 +116,19 @@ $(IPKG_PPP_MOD_RADIUS): $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf $(IPKG_CHAT): install -d -m0755 $(IDIR_CHAT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/ $(RSTRIP) $(IDIR_CHAT) $(IPKG_BUILD) $(IDIR_CHAT) $(PACKAGE_DIR) $(IPKG_PPPDUMP): install -d -m0755 $(IDIR_PPPDUMP)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/ $(RSTRIP) $(IDIR_PPPDUMP) $(IPKG_BUILD) $(IDIR_PPPDUMP) $(PACKAGE_DIR) $(IPKG_PPPSTATS): $(IPKG_PPP) install -d -m0755 $(IDIR_PPPSTATS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/ $(RSTRIP) $(IDIR_PPPSTATS) $(IPKG_BUILD) $(IDIR_PPPSTATS) $(PACKAGE_DIR) diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index a115bd511f..32e301d75d 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -63,7 +63,7 @@ $(IPKG_PPTPD): install -d -m0755 $(IDIR_PPTPD)/etc/ppp install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/ install -d -m0755 $(IDIR_PPTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/ $(RSTRIP) $(IDIR_PPTPD) $(IPKG_BUILD) $(IDIR_PPTPD) $(PACKAGE_DIR) diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index 8330cb07b7..4a2a3fe63f 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -64,6 +64,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PTUNNEL): install -m0755 -d $(IDIR_PTUNNEL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(IDIR_PTUNNEL)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(IDIR_PTUNNEL)/usr/sbin/ $(RSTRIP) $(IDIR_PTUNNEL) $(IPKG_BUILD) $(IDIR_PTUNNEL) $(PACKAGE_DIR) diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 32d6d6603e..51b424b68c 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -71,10 +71,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_QUAGGA): install -d -m0755 $(IDIR_QUAGGA)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/ install -d -m0755 $(IDIR_QUAGGA)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/ # avoid /etc being set to 0750 install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/ chmod 0750 $(IDIR_QUAGGA)/etc/quagga/ @@ -86,38 +86,38 @@ $(IPKG_QUAGGA): $(IPKG_QUAGGA_BGPD): install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_BGPD) $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR) $(IPKG_QUAGGA_OSPFD): install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/ install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPFD) $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR) $(IPKG_QUAGGA_OSPF6D): install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPF6D) $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR) $(IPKG_QUAGGA_RIPD): install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_RIPD) $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR) $(IPKG_QUAGGA_RIPNGD): install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_RIPNGD) $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR) $(IPKG_QUAGGA_VTYSH): install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/ $(RSTRIP) $(IDIR_QUAGGA_VTYSH) $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR) diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 6908704301..1526ea80a8 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -50,6 +50,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RADDUMP): mkdir -p $(IDIR_RADDUMP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_RADDUMP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_RADDUMP)/ $(RSTRIP) $(IDIR_RADDUMP) $(IPKG_BUILD) $(IDIR_RADDUMP) $(PACKAGE_DIR) diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 44effa8676..b91cd83a43 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -65,7 +65,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RARPD): install -d -m0755 $(IDIR_RARPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(IDIR_RARPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(IDIR_RARPD)/usr/sbin/ install -d -m0755 $(IDIR_RARPD)/etc/default install -m644 ./files/rarpd.default $(IDIR_RARPD)/etc/default/rarpd install -d -m0755 $(IDIR_RARPD)/etc/init.d diff --git a/package/readline/Makefile b/package/readline/Makefile index e9c8fdb3f9..2e044a1844 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBREADLINE): install -m0755 -d $(IDIR_LIBREADLINE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(IDIR_LIBREADLINE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(IDIR_LIBREADLINE)/usr/lib/ $(RSTRIP) $(IDIR_LIBREADLINE) $(IPKG_BUILD) $(IDIR_LIBREADLINE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libreadline.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libreadline.so diff --git a/package/reaim/Makefile b/package/reaim/Makefile index dc1a0927b8..959e0de91d 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -36,7 +36,7 @@ $(IPKG_REAIM): install -m0755 ./files/reaim.init $(IDIR_REAIM)/etc/init.d/reaim ln -sf reaim $(IDIR_REAIM)/etc/init.d/S63reaim install -d -m0755 $(IDIR_REAIM)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/reaim $(IDIR_REAIM)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(IDIR_REAIM)/usr/sbin/ $(RSTRIP) $(IDIR_REAIM) $(IPKG_BUILD) $(IDIR_REAIM) $(PACKAGE_DIR) diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index e556afd472..1b829d8363 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -66,8 +66,8 @@ $(IPKG_PPPOE_CLIENT): install -d -m0755 $(IDIR_PPPOE_CLIENT)/etc/ppp install -m0644 $(PKG_INSTALL_DIR)/etc/pppoe.conf $(IDIR_PPPOE_CLIENT)/etc/ install -d -m0755 $(IDIR_PPPOE_CLIENT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(IDIR_PPPOE_CLIENT)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(IDIR_PPPOE_CLIENT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(IDIR_PPPOE_CLIENT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(IDIR_PPPOE_CLIENT)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_CLIENT) $(IPKG_BUILD) $(IDIR_PPPOE_CLIENT) $(PACKAGE_DIR) @@ -77,7 +77,7 @@ $(IPKG_PPPOE_RELAY): install -d -m0755 $(IDIR_PPPOE_RELAY)/etc/init.d install -m0755 ./files/pppoe-relay.init $(IDIR_PPPOE_RELAY)/etc/init.d/pppoe-relay install -d -m0755 $(IDIR_PPPOE_RELAY)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(IDIR_PPPOE_RELAY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(IDIR_PPPOE_RELAY)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_RELAY) $(IPKG_BUILD) $(IDIR_PPPOE_RELAY) $(PACKAGE_DIR) @@ -89,13 +89,13 @@ $(IPKG_PPPOE_SERVER): install -d -m0755 $(IDIR_PPPOE_SERVER)/etc/ppp install -m0644 $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(IDIR_PPPOE_SERVER)/etc/ppp/ install -d -m0755 $(IDIR_PPPOE_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(IDIR_PPPOE_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(IDIR_PPPOE_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_SERVER) $(IPKG_BUILD) $(IDIR_PPPOE_SERVER) $(PACKAGE_DIR) $(IPKG_PPPOE_SNIFF): install -d -m0755 $(IDIR_PPPOE_SNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(IDIR_PPPOE_SNIFF)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(IDIR_PPPOE_SNIFF)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_SNIFF) $(IPKG_BUILD) $(IDIR_PPPOE_SNIFF) $(PACKAGE_DIR) diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index cc2e19ac43..9f105dbe09 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -72,7 +72,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDCOLLECT): install -d -m0755 $(IDIR_RRDCOLLECT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(IDIR_RRDCOLLECT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(IDIR_RRDCOLLECT)/usr/sbin/ $(RSTRIP) $(IDIR_RRDCOLLECT) $(IPKG_BUILD) $(IDIR_RRDCOLLECT) $(PACKAGE_DIR) diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index e34c9bff7b..1b374548ee 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -19,15 +19,15 @@ exec:///bin/df # LAN: vlan0, WAN: vlan1, WIFI: eth1 file:///proc/net/dev -" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo -" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo -" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo -#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo +"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo +"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo +"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo +#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo file:///proc/slabinfo "ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con "arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp file:///proc/interrupts -" 4: %d MIPS eth1" SYS.rrd:irw -" 5: %d MIPS eth0" SYS.rrd:ire +"4: %d MIPS eth1" SYS.rrd:irw +"5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index eaa0e32b7d..3bea4aa9a6 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -71,32 +71,32 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDTOOL): install -d -m0755 $(IDIR_RRDTOOL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/ $(RSTRIP) $(IDIR_RRDTOOL) $(IPKG_BUILD) $(IDIR_RRDTOOL) $(PACKAGE_DIR) $(IPKG_RRDCGI): install -d -m0755 $(IDIR_RRDCGI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/ $(RSTRIP) $(IDIR_RRDCGI) $(IPKG_BUILD) $(IDIR_RRDCGI) $(PACKAGE_DIR) $(IPKG_LIBRRD): install -d -m0755 $(IDIR_LIBRRD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/ install -d -m0755 $(IDIR_LIBRRD)/usr/share/rrdtool/fonts - cp -fpR $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ + $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ $(IDIR_LIBRRD)/usr/share/rrdtool/fonts/ $(RSTRIP) $(IDIR_LIBRRD) $(IPKG_BUILD) $(IDIR_LIBRRD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so diff --git a/package/rrdtool1/Makefile b/package/rrdtool1/Makefile index 0dc0a47a50..b0eb9fcc71 100644 --- a/package/rrdtool1/Makefile +++ b/package/rrdtool1/Makefile @@ -68,29 +68,29 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDTOOL1): install -d -m0755 $(IDIR_RRDTOOL1)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/ $(RSTRIP) $(IDIR_RRDTOOL1) $(IPKG_BUILD) $(IDIR_RRDTOOL1) $(PACKAGE_DIR) $(IPKG_RRDCGI1): install -d -m0755 $(IDIR_RRDCGI1)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/ $(RSTRIP) $(IDIR_RRDCGI1) $(IPKG_BUILD) $(IDIR_RRDCGI1) $(PACKAGE_DIR) $(IPKG_LIBRRD1): install -d -m0755 $(IDIR_LIBRRD1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/ $(RSTRIP) $(IDIR_LIBRRD1) $(IPKG_BUILD) $(IDIR_LIBRRD1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so diff --git a/package/rsync/Makefile b/package/rsync/Makefile index bd0bfab920..0089326e31 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -58,6 +58,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RSYNC): install -d -m0755 $(IDIR_RSYNC)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_RSYNC)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_RSYNC)/usr/bin $(RSTRIP) $(IDIR_RSYNC) $(IPKG_BUILD) $(IDIR_RSYNC) $(PACKAGE_DIR) diff --git a/package/sablevm-classpath/Makefile b/package/sablevm-classpath/Makefile index 13fa555135..cbe7634028 100644 --- a/package/sablevm-classpath/Makefile +++ b/package/sablevm-classpath/Makefile @@ -64,21 +64,21 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install - cp ./files/mini.classlist $(PKG_BUILD_DIR)/lib/ + $(CP) ./files/mini.classlist $(PKG_BUILD_DIR)/lib/ cd $(PKG_BUILD_DIR)/lib ; fastjar -Mcf mini.jar -@ < mini.classlist touch $@ $(IPKG_LIBSABLEVM_CLASSPATH): install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ $(RSTRIP) $(IDIR_LIBSABLEVM_CLASSPATH) $(IPKG_BUILD) $(IDIR_LIBSABLEVM_CLASSPATH) $(PACKAGE_DIR) $(IPKG_SABLEVM_CLASSPATH_FULL): install -d -m0755 $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath - cp -fpR $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath/ $(IPKG_BUILD) $(IDIR_SABLEVM_CLASSPATH_FULL) $(PACKAGE_DIR) diff --git a/package/sablevm/Makefile b/package/sablevm/Makefile index e57fdb2256..7eec3f4924 100644 --- a/package/sablevm/Makefile +++ b/package/sablevm/Makefile @@ -61,8 +61,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SABLEVM): install -m0755 -d $(IDIR_SABLEVM)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ install -m0755 -d $(IDIR_SABLEVM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ $(RSTRIP) $(IDIR_SABLEVM) $(IPKG_BUILD) $(IDIR_SABLEVM) $(PACKAGE_DIR) diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index b3d10b5847..31ac686939 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -63,8 +63,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SANE_BACKENDS): install -d -m0755 $(IDIR_SANE_BACKENDS)/etc/sane.d - cp -fpR $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(IDIR_SANE_BACKENDS)/etc/sane.d/ + $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(IDIR_SANE_BACKENDS)/etc/sane.d/ install -d -m0755 $(IDIR_SANE_BACKENDS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/saned $(IDIR_SANE_BACKENDS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/saned $(IDIR_SANE_BACKENDS)/usr/sbin/ $(RSTRIP) $(IDIR_SANE_BACKENDS) $(IPKG_BUILD) $(IDIR_SANE_BACKENDS) $(PACKAGE_DIR) diff --git a/package/scdp/Makefile b/package/scdp/Makefile index ce09d2ef9a..c8909c6fef 100644 --- a/package/scdp/Makefile +++ b/package/scdp/Makefile @@ -60,6 +60,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SCDP): install -d -m0755 $(IDIR_SCDP)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/scdp $(IDIR_SCDP)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/scdp $(IDIR_SCDP)/usr/bin/ $(RSTRIP) $(IDIR_SCDP) $(IPKG_BUILD) $(IDIR_SCDP) $(PACKAGE_DIR) diff --git a/package/sdk/Makefile b/package/sdk/Makefile index cec93b9d87..3f62aec115 100644 --- a/package/sdk/Makefile +++ b/package/sdk/Makefile @@ -20,13 +20,13 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: ) rm -rf $(SDK_BUILD_DIR) mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package - cp -a $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ - cp -a $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples - cp $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/ - cp ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile - cp ./files/README.SDK $(SDK_BUILD_DIR)/ - cp ./files/depend.mk $(SDK_BUILD_DIR)/package/ - cp $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/ + $(CP) $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(CP) $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples + $(CP) $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/ + $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile + $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ + $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/ + $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/ egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 435b340c93..f28b26913e 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -56,15 +56,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SERDISPLIB): install -d -m0755 $(IDIR_SERDISPLIB)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(IDIR_SERDISPLIB)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(IDIR_SERDISPLIB)/usr/lib $(RSTRIP) $(IDIR_SERDISPLIB) $(IPKG_BUILD) $(IDIR_SERDISPLIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libserdisp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libserdisp.so diff --git a/package/shfs/Makefile b/package/shfs/Makefile index fd6f3e46d7..b1509a7c4a 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -35,8 +35,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SHFS_UTILS): install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_SHFS_UTILS) $(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR) diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index ac45a255f4..78571a621f 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -58,11 +58,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SIPROXD): install -d -m0755 $(IDIR_SIPROXD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf - cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf + $(CP) $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/ install -d -m0755 $(IDIR_SIPROXD)/etc/init.d install -m0755 files/siproxd.init $(IDIR_SIPROXD)/etc/init.d/siproxd install -d -m0755 $(IDIR_SIPROXD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/ $(RSTRIP) $(IDIR_SIPROXD) $(IPKG_BUILD) $(IDIR_SIPROXD) $(PACKAGE_DIR) diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 857f685f5b..c0dd1c1350 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -61,6 +61,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SIPSAK): install -d -m0755 $(IDIR_SIPSAK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sipsak $(IDIR_SIPSAK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(IDIR_SIPSAK)/usr/bin/ $(RSTRIP) $(IDIR_SIPSAK) $(IPKG_BUILD) $(IDIR_SIPSAK) $(PACKAGE_DIR) diff --git a/package/slurm/Makefile b/package/slurm/Makefile index d3244a112d..91467adfb8 100644 --- a/package/slurm/Makefile +++ b/package/slurm/Makefile @@ -64,7 +64,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SLURM): install -d -m0755 $(IDIR_SLURM)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/slurm $(IDIR_SLURM)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/slurm $(IDIR_SLURM)/usr/bin/ $(RSTRIP) $(IDIR_SLURM) $(IPKG_BUILD) $(IDIR_SLURM) $(PACKAGE_DIR) diff --git a/package/socat/Makefile b/package/socat/Makefile index 968d35e3e8..034a6186a4 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -60,7 +60,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SOCAT): install -d -m0755 $(IDIR_SOCAT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/socat $(IDIR_SOCAT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(IDIR_SOCAT)/usr/bin/ $(RSTRIP) $(IDIR_SOCAT) $(IPKG_BUILD) $(IDIR_SOCAT) $(PACKAGE_DIR) diff --git a/package/speex/Makefile b/package/speex/Makefile index a79ee02da4..87a3de9679 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -61,17 +61,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSPEEX): install -d -m0755 $(IDIR_LIBSPEEX)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ $(RSTRIP) $(IDIR_LIBSPEEX) $(IPKG_BUILD) $(IDIR_LIBSPEEX) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libspeex.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libspeex.so diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index b85d8944f5..aefb458a17 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -67,23 +67,23 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSQLITE): install -d -m0755 $(IDIR_LIBSQLITE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/ $(RSTRIP) $(IDIR_LIBSQLITE) $(IPKG_BUILD) $(IDIR_LIBSQLITE) $(PACKAGE_DIR) $(IPKG_SQLITE_CLI): install -d -m0755 $(IDIR_SQLITE_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/ $(RSTRIP) $(IDIR_SQLITE_CLI) $(IPKG_BUILD) $(IDIR_SQLITE_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsqlite3.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libsqlite3.so diff --git a/package/sqlite2/Makefile b/package/sqlite2/Makefile index 5b5f599b1f..41a7382c96 100644 --- a/package/sqlite2/Makefile +++ b/package/sqlite2/Makefile @@ -66,23 +66,23 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSQLITE2): install -d -m0755 $(IDIR_LIBSQLITE2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(IDIR_LIBSQLITE2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(IDIR_LIBSQLITE2)/usr/lib/ $(RSTRIP) $(IDIR_LIBSQLITE2) $(IPKG_BUILD) $(IDIR_LIBSQLITE2) $(PACKAGE_DIR) $(IPKG_SQLITE2_CLI): install -d -m0755 $(IDIR_SQLITE2_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite $(IDIR_SQLITE2_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(IDIR_SQLITE2_CLI)/usr/bin/ $(RSTRIP) $(IDIR_SQLITE2_CLI) $(IPKG_BUILD) $(IDIR_SQLITE2_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsqlite.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libsqlite.so diff --git a/package/srelay/Makefile b/package/srelay/Makefile index 485ea26abe..9dc0b9545b 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -53,15 +53,15 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) \ all - cp $(PKG_BUILD_DIR)/srelay $(PKG_INSTALL_DIR) + $(CP) $(PKG_BUILD_DIR)/srelay $(PKG_INSTALL_DIR) touch $@ $(IPKG_SRELAY): install -m0755 -d $(IDIR_SRELAY)/usr/bin install -m0755 -d $(IDIR_SRELAY)/etc/init.d - cp -fpR $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/ - cp -fpR files/srelay.init $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay - cp -fpR files/srelay.conf $(IDIR_SRELAY)/etc + $(CP) $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/ + $(CP) files/srelay.init $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay + $(CP) files/srelay.conf $(IDIR_SRELAY)/etc chmod 755 $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay $(RSTRIP) $(IDIR_SRELAY) $(IPKG_BUILD) $(IDIR_SRELAY) $(PACKAGE_DIR) diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile index 54235e506f..3204ca8786 100644 --- a/package/ssmtp/Makefile +++ b/package/ssmtp/Makefile @@ -59,7 +59,7 @@ $(IPKG_SSMTP): install -m0644 $(PKG_BUILD_DIR)/ssmtp.conf $(IDIR_SSMTP)/etc/ssmtp/ install -m0644 $(PKG_BUILD_DIR)/revaliases $(IDIR_SSMTP)/etc/ssmtp/ install -m0755 -d $(IDIR_SSMTP)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/ssmtp $(IDIR_SSMTP)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ssmtp $(IDIR_SSMTP)/usr/sbin/ ln -sf ssmtp $(IDIR_SSMTP)/usr/sbin/sendmail $(RSTRIP) $(IDIR_SSMTP) $(IPKG_BUILD) $(IDIR_SSMTP) $(PACKAGE_DIR) diff --git a/package/strace/Makefile b/package/strace/Makefile index 000334d955..d356f918ad 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_STRACE): mkdir -p $(IDIR_STRACE)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_STRACE)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_STRACE)/usr/sbin/ $(STRIP) $(IDIR_STRACE)/usr/sbin/* $(IPKG_BUILD) $(IDIR_STRACE) $(PACKAGE_DIR) diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index cbd68d4f63..9eb1d77533 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -41,16 +41,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBWRAP): install -d -m0755 $(IDIR_LIBWRAP)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBWRAP) $(IPKG_BUILD) $(IDIR_LIBWRAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libwrap.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ -# cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ +# $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libwrap.a diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 769be77226..912fcc3db0 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -63,7 +63,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_TINC): install -m0755 -d $(IDIR_TINC)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/ $(RSTRIP) $(IDIR_TINC) $(IPKG_BUILD) $(IDIR_TINC) $(PACKAGE_DIR) diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index c5f9532f9f..3f2173ac48 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -75,9 +75,9 @@ $(IPKG_TINYPROXY): $(IDIR_TINYPROXY)/etc/init.d \ $(IDIR_TINYPROXY)/var/log \ $(IDIR_TINYPROXY)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(IDIR_TINYPROXY)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/tinyproxy $(IDIR_TINYPROXY)/usr/share/ - cp -fpR $(PKG_INSTALL_DIR)/etc/tinyproxy $(IDIR_TINYPROXY)/etc/ - cp -fpR files/$(PKG_NAME).init $(IDIR_TINYPROXY)/etc/init.d/$(PKG_NAME) + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(IDIR_TINYPROXY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy $(IDIR_TINYPROXY)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/etc/tinyproxy $(IDIR_TINYPROXY)/etc/ + $(CP) files/$(PKG_NAME).init $(IDIR_TINYPROXY)/etc/init.d/$(PKG_NAME) $(RSTRIP) $(IDIR_TINYPROXY) $(IPKG_BUILD) $(IDIR_TINYPROXY) $(PACKAGE_DIR) diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index c5414f3b6b..32098d0001 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -55,6 +55,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_TMSNC): mkdir -p $(IDIR_TMSNC) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_TMSNC)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_TMSNC)/ $(RSTRIP) $(IDIR_TMSNC) $(IPKG_BUILD) $(IDIR_TMSNC) $(PACKAGE_DIR) diff --git a/package/tor/Makefile b/package/tor/Makefile index 1eced61efd..d961f37403 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -70,7 +70,7 @@ $(IPKG_TOR): install -d -m0755 $(IDIR_TOR)/etc/tor install -m0644 ./files/torrc $(IDIR_TOR)/etc/tor/torrc install -d -m0755 $(IDIR_TOR)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/ $(RSTRIP) $(IDIR_TOR) $(IPKG_BUILD) $(IDIR_TOR) $(PACKAGE_DIR) diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 53dbbcdcc9..bb08547321 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -32,7 +32,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ ) $(PKG_BUILD_DIR)/.configured: - cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config + $(CP) ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: @@ -46,7 +46,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UCLIBCXX): install -d -m0755 $(IDIR_UCLIBCXX)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/ $(STRIP) $(IDIR_UCLIBCXX)/usr/lib/*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR) diff --git a/package/udev/Makefile b/package/udev/Makefile index 34cdba6ce1..df3e4afff0 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -38,19 +38,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UDEV): install -d -m0775 $(IDIR_UDEV)/etc/udev - cp -fpR $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ + $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ install -d -m0775 $(IDIR_UDEV)/lib/udev install -d -m0775 $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ install -d -m0775 $(IDIR_UDEV)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ install -d -m0775 $(IDIR_UDEV)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ $(RSTRIP) $(IDIR_UDEV) $(IPKG_BUILD) $(IDIR_UDEV) $(PACKAGE_DIR) diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index 99033e24c4..040a7e778e 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UDP_BROADCAST_RELAY): mkdir -p $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/ $(STRIP) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/* $(IPKG_BUILD) $(IDIR_UDP_BROADCAST_RELAY) $(PACKAGE_DIR) diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index 42d8a86925..893fd5b8f9 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -30,7 +30,7 @@ define IPKG_plugin_template $$(IPKG_$(1)): install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \ done $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) @@ -92,15 +92,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ULOGD): install -d -m0755 $(IDIR_ULOGD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/ install -d -m0755 $(IDIR_ULOGD)/etc/default install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd install -d -m0755 $(IDIR_ULOGD)/etc/init.d install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd ln -sf ulogd $(IDIR_ULOGD)/etc/init.d/S49ulogd install -d -m0755 $(IDIR_ULOGD)/usr/lib/ulogd - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/ install -d -m0755 $(IDIR_ULOGD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/ $(RSTRIP) $(IDIR_ULOGD) $(IPKG_BUILD) $(IDIR_ULOGD) $(PACKAGE_DIR) diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index cc88b5a616..1edc3dd4e8 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -74,7 +74,7 @@ $(IPKG_UPDATEDD): install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/ install -d -m0755 $(IDIR_UPDATEDD)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/ install -d -m0755 $(IDIR_UPDATEDD)/usr/lib/updatedd $(RSTRIP) $(IDIR_UPDATEDD) $(IPKG_BUILD) $(IDIR_UPDATEDD) $(PACKAGE_DIR) diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 8e6112cd97..5ce35bcfb5 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -60,8 +60,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LSUSB): install -d -m0755 $(IDIR_LSUSB)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ install -d -m0755 $(IDIR_LSUSB)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ $(RSTRIP) $(IDIR_LSUSB) $(IPKG_BUILD) $(IDIR_LSUSB) $(PACKAGE_DIR) diff --git a/package/ustl/Makefile b/package/ustl/Makefile index 36b77c9583..f211f812d6 100644 --- a/package/ustl/Makefile +++ b/package/ustl/Makefile @@ -21,8 +21,8 @@ BR2_PACKAGE_USTL:=m $(eval $(call PKG_template,USTL,ustl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp ./files/config.h $(PKG_BUILD_DIR)/ - cp ./files/Common.mk $(PKG_BUILD_DIR)/ + $(CP) ./files/config.h $(PKG_BUILD_DIR)/ + $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.built: @@ -37,16 +37,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_USTL): install -d -m0755 $(IDIR_USTL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(IDIR_USTL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(IDIR_USTL)/usr/lib/ $(RSTRIP) $(IDIR_USTL) $(IPKG_BUILD) $(IDIR_USTL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libustl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libustl.so diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7eb180173e..6e8f5abd7f 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -44,20 +44,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FDISK): install -d -m0755 $(IDIR_FDISK)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ $(RSTRIP) $(IDIR_FDISK) $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) $(IPKG_LOSETUP): install -d -m0755 $(IDIR_LOSETUP)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ $(RSTRIP) $(IDIR_LOSETUP) $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR) $(IPKG_SWAP_UTILS): install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_SWAP_UTILS) $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR) diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 7e75b0d240..29fd8711ec 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -45,6 +45,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VGP): mkdir -p $(IDIR_VGP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VGP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_VGP)/ $(RSTRIP) $(IDIR_VGP) $(IPKG_BUILD) $(IDIR_VGP) $(PACKAGE_DIR) diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile index 147017568e..009388e208 100644 --- a/package/vnstat/Makefile +++ b/package/vnstat/Makefile @@ -28,6 +28,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VNSTAT): install -d -m0755 $(IDIR_VNSTAT)/usr/bin - cp $(PKG_BUILD_DIR)/src/vnstat $(IDIR_VNSTAT)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/vnstat $(IDIR_VNSTAT)/usr/bin/ $(STRIP) $(IDIR_VNSTAT)/usr/bin/* $(IPKG_BUILD) $(IDIR_VNSTAT) $(PACKAGE_DIR) diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index 55082905de..eb21240c07 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -35,6 +35,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VPNC): install -d -m0755 $(IDIR_VPNC) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/ $(RSTRIP) $(IDIR_VPNC) $(IPKG_BUILD) $(IDIR_VPNC) $(PACKAGE_DIR) diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 42044579e0..d3c72c8598 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -37,6 +37,6 @@ $(IPKG_VSFTPD): install -d -m0755 $(IDIR_VSFTPD)/etc/init.d install -m0755 ./files/vsftpd.init $(IDIR_VSFTPD)/etc/init.d/vsftpd install -d -m0755 $(IDIR_VSFTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/ $(RSTRIP) $(IDIR_VSFTPD) $(IPKG_BUILD) $(IDIR_VSFTPD) $(PACKAGE_DIR) diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index 5046c18180..415fc40ca7 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -60,12 +60,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WATCHDOG): install -d -m0755 $(IDIR_WATCHDOG)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/watchdog.conf $(IDIR_WATCHDOG)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/watchdog.conf $(IDIR_WATCHDOG)/etc/ install -d -m0755 $(IDIR_WATCHDOG)/etc/init.d install -m0755 ./files/watchdog.init $(IDIR_WATCHDOG)/etc/init.d/watchdog ln -sf watchdog $(IDIR_WATCHDOG)/etc/init.d/S90watchdog install -d -m0755 $(IDIR_WATCHDOG)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchdog $(IDIR_WATCHDOG)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wd_keepalive $(IDIR_WATCHDOG)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchdog $(IDIR_WATCHDOG)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wd_keepalive $(IDIR_WATCHDOG)/usr/sbin/ $(RSTRIP) $(IDIR_WATCHDOG) $(IPKG_BUILD) $(IDIR_WATCHDOG) $(PACKAGE_DIR) diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile index 044b839ad5..0ecb34e1b4 100644 --- a/package/wccpd/Makefile +++ b/package/wccpd/Makefile @@ -60,6 +60,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WCCPD): install -d -m0755 $(IDIR_WCCPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(IDIR_WCCPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(IDIR_WCCPD)/usr/sbin/ $(RSTRIP) $(IDIR_WCCPD) $(IPKG_BUILD) $(IDIR_WCCPD) $(PACKAGE_DIR) diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index f1b29bc022..3847c8a932 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -66,9 +66,9 @@ $(IPKG_WIFIDOG): install -m0755 -d $(IDIR_WIFIDOG)/usr/bin install -m0755 -d $(IDIR_WIFIDOG)/usr/lib install -m0755 $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(IDIR_WIFIDOG)/usr/bin/wifidog-init - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wifidog $(IDIR_WIFIDOG)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wdctl $(IDIR_WIFIDOG)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(IDIR_WIFIDOG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(IDIR_WIFIDOG)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(IDIR_WIFIDOG)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(IDIR_WIFIDOG)/usr/lib/ $(RSTRIP) $(IDIR_WIFIDOG) $(IPKG_BUILD) $(IDIR_WIFIDOG) $(PACKAGE_DIR) diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 71f0a2f219..209f800df4 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -24,28 +24,28 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ - libiw.so.28 iwmulticall + all iwmulticall mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \ - install-iwmulticall + install install-iwmulticall touch $@ $(IPKG_WIRELESS_TOOLS): mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ $(RSTRIP) $(IDIR_WIRELESS_TOOLS) $(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR) install-dev: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/{lib,include} - cp -a $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so - cp -a $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ uninstall-dev: rm -f $(STAGING_DIR)/usr/lib/libiw.* diff --git a/package/wiviz/Makefile b/package/wiviz/Makefile index 73a32a470e..d5317f1ba6 100644 --- a/package/wiviz/Makefile +++ b/package/wiviz/Makefile @@ -14,7 +14,7 @@ $(eval $(call PKG_template,WIVIZ,wiviz,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -30,9 +30,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WIVIZ): mkdir -p $(IDIR_WIVIZ)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_WIVIZ)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_WIVIZ)/usr/sbin/ $(RSTRIP) $(IDIR_WIVIZ) - cp -fpR ./files/* $(IDIR_WIVIZ) + $(CP) ./files/* $(IDIR_WIVIZ) find $(IDIR_WIVIZ) -name CVS | xargs rm -rf find $(IDIR_WIVIZ) -name .svn | xargs rm -rf $(IPKG_BUILD) $(IDIR_WIVIZ) $(PACKAGE_DIR) diff --git a/package/wol/Makefile b/package/wol/Makefile index 3a8811686e..efdb670378 100644 --- a/package/wol/Makefile +++ b/package/wol/Makefile @@ -61,6 +61,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WOL): install -m0755 -d $(IDIR_WOL)/usr/bin - cp $(PKG_INSTALL_DIR)/usr/bin/wol $(IDIR_WOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wol $(IDIR_WOL)/usr/bin/ $(RSTRIP) $(IDIR_WOL) $(IPKG_BUILD) $(IDIR_WOL) $(PACKAGE_DIR) diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile index af441388b1..44533c64df 100644 --- a/package/wondershaper/Makefile +++ b/package/wondershaper/Makefile @@ -28,8 +28,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WONDERSHAPER): install -d -m0755 $(IDIR_WONDERSHAPER)/usr/sbin install -d -m0755 $(IDIR_WONDERSHAPER)/etc/init.d - cp -fpR $(PKG_BUILD_DIR)/wshaper.htb $(IDIR_WONDERSHAPER)/usr/sbin/wshaper - cp -fpR $(PKG_BUILD_DIR)/wshaper.conf $(IDIR_WONDERSHAPER)/etc/wshaper.conf + $(CP) $(PKG_BUILD_DIR)/wshaper.htb $(IDIR_WONDERSHAPER)/usr/sbin/wshaper + $(CP) $(PKG_BUILD_DIR)/wshaper.conf $(IDIR_WONDERSHAPER)/etc/wshaper.conf ln -fs /usr/sbin/wshaper $(IDIR_WONDERSHAPER)/etc/init.d/S60wondershaper $(IPKG_BUILD) $(IDIR_WONDERSHAPER) $(PACKAGE_DIR) diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 34e9fcfdd4..b1a9bd1b33 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp -fpR ./files/config $(PKG_BUILD_DIR)/.config + $(CP) ./files/config $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/wx200d/Makefile b/package/wx200d/Makefile index 7eb3a4054f..4673e83f28 100644 --- a/package/wx200d/Makefile +++ b/package/wx200d/Makefile @@ -59,12 +59,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WX200D): install -d -m0755 $(IDIR_WX200D)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wx200 \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ $(PKG_INSTALL_DIR)/usr/bin/wxdebug $(IDIR_WX200D)/usr/bin/ install -d -m0755 $(IDIR_WX200D)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ $(PKG_INSTALL_DIR)/usr/sbin/wxread $(IDIR_WX200D)/usr/sbin/ $(RSTRIP) $(IDIR_WX200D) $(IPKG_BUILD) $(IDIR_WX200D) $(PACKAGE_DIR) diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 3b22beceb9..a3e5d59e6a 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -66,6 +66,6 @@ $(IPKG_XINETD): install -d -m0755 $(IDIR_XINETD)/etc/init.d install -m0755 ./files/xinetd.init $(IDIR_XINETD)/etc/init.d/xinetd install -d -m0755 $(IDIR_XINETD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/ $(RSTRIP) $(IDIR_XINETD) $(IPKG_BUILD) $(IDIR_XINETD) $(PACKAGE_DIR) diff --git a/package/xsupplicant/Makefile b/package/xsupplicant/Makefile index dea7899475..45663eb43c 100644 --- a/package/xsupplicant/Makefile +++ b/package/xsupplicant/Makefile @@ -65,8 +65,8 @@ $(IPKG_XSUPPLICANT): install -d -m0755 $(IDIR_XSUPPLICANT)/etc install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(IDIR_XSUPPLICANT)/etc/ install -d -m0755 $(IDIR_XSUPPLICANT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/ install -d -m0755 $(IDIR_XSUPPLICANT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/ $(RSTRIP) $(IDIR_XSUPPLICANT) $(IPKG_BUILD) $(IDIR_XSUPPLICANT) $(PACKAGE_DIR) diff --git a/package/zlib/Makefile b/package/zlib/Makefile index f5a39b2685..cfd82800a8 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -43,15 +43,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ZLIB): install -m0755 -d $(IDIR_ZLIB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ $(RSTRIP) $(IDIR_ZLIB) $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib touch $(STAGING_DIR)/usr/lib/libz.so install-dev: $(STAGING_DIR)/usr/lib/libz.so diff --git a/rules.mk b/rules.mk index 31c2b4f914..9d924a5b40 100644 --- a/rules.mk +++ b/rules.mk @@ -38,6 +38,7 @@ START_TRACE:=: END_TRACE:=: endif +CP=cp -fpR MAKE1=make MAKEFLAGS=-j$(BR2_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS) # Strip off the annoying quoting diff --git a/scripts/ipkg b/scripts/ipkg index 6cd1cb440a..7ceaeff69c 100755 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -787,7 +787,7 @@ ipkg_install_file_dest() { echo "Package: $pkg Status: install ok pending" | ipkg_status_update_sd $sd $pkg mkdir -p $IPKG_PENDING_DIR - cp $filename $IPKG_PENDING_DIR + cp -f $filename $IPKG_PENDING_DIR rm -r $IPKG_TMP/$pkg/control rm -r $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg diff --git a/target/linux/Makefile b/target/linux/Makefile index 626587b5b0..4ef6c45a06 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -60,13 +60,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: rm -rf $(IB_DIR) mkdir -p $(IB_DIR)/packages mkdir -p $(IB_DIR)/scripts - cp -fpR ./imagebuilder/* $(IB_DIR)/ - cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ - cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ + $(CP) ./imagebuilder/* $(IB_DIR)/ + $(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ + $(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ $(MAKE) install-ib - cp $(TOPDIR)/rules.mk $(IB_DIR) - cp -fpR ./image $(IB_DIR)/ - cp $(TOPDIR)/.config $(IB_DIR)/ + $(CP) $(TOPDIR)/rules.mk $(IB_DIR) + $(CP) ./image $(IB_DIR)/ + $(CP) $(TOPDIR)/.config $(IB_DIR)/ find $(IB_DIR) -name .svn | xargs rm -rf find $(IB_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2) diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index 989bcc4582..6e6551b193 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -12,6 +12,6 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index daa734107d..10be12117b 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -13,13 +13,13 @@ ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION) $(eval $(call KMOD_template,SANGAM_ATM_A,sangam-atm-annex-a,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,SANGAM_ATM_B,sangam-atm-annex-b,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,CPMAC,cpmac,\ @@ -33,7 +33,7 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 111bfd08a5..3e1ee17df2 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -15,9 +15,9 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) ifeq ($(BR2_ARUBA_RAMDISK),y) - @cp config-ramdisk $(LINUX_DIR)/.config + @$(CP) config-ramdisk $(LINUX_DIR)/.config else - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config endif touch $@ diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 33d5f1b835..ab68b7ae88 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -30,7 +30,7 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ @@ -56,12 +56,12 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # copy binary wlan driver mkdir -p $(LINUX_DIR)/drivers/net/wl - cp -fpR $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl + $(CP) $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl touch $@ $(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done mkdir -p $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl - @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || cp $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ + @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || $(CP) $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ touch $@ linux-dirclean: drivers-clean diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index 9b2e16c0bf..489278a67b 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -14,6 +14,6 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 7c65b6e3e1..e64efbf357 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -33,12 +33,13 @@ install-ib: @$(TRACE) target/linux/image/$(BOARD)-install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ install-prepare: find $(KDIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(KDIR)/root -type f -perm +0100 | xargs chmod 0755 find $(KDIR)/root -type d | xargs chmod 0755 + mkdir -p $(KDIR)/root/tmp chmod 0777 $(KDIR)/root/tmp rebuild: clean prepare compile install diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 0b73787854..38fce6bdfc 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -62,7 +62,7 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: - cp $(KDIR)/vmlinux.bin $@ + $(CP) $(KDIR)/vmlinux.bin $@ ifeq ($(FS),jffs2-8MB) ALIGN:=bs=131072 conv=sync @@ -106,7 +106,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ mkdir -p $(IB_DIR)/staging_dir_$(ARCH) - cp -fpR $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ + $(CP) $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index 2a7f2e4682..a2cceaf0c1 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -62,5 +62,5 @@ endif install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index b15e10b412..18bd3265c3 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -32,7 +32,7 @@ endif $(KDIR)/loader.tmp.gz: - cp $(BUILD_DIR)/loader.gz $@ + $(CP) $(BUILD_DIR)/loader.gz $@ echo -ne "\\x00" >> $@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz @@ -73,19 +73,11 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) # ifeq ($(FS),squashfs) # $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx -# cp $< $@ +# $(CP) $< $@ # echo -ne '\x01' >> $@ # # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx # endif - -ifneq ($(FS),jffs2-8MB) -$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g - -$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g - $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g @@ -120,8 +112,8 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ + $(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/lzma-loader/Makefile b/target/linux/image/brcm/lzma-loader/Makefile index 134fdde9dd..1d7b6a3196 100644 --- a/target/linux/image/brcm/lzma-loader/Makefile +++ b/target/linux/image/brcm/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared @@ -17,10 +17,10 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) $(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz - cp $< $@ + $(CP) $< $@ $(BUILD_DIR)/loader.elf: $(PKG_BUILD_DIR)/loader.o - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/generic/lzma-loader/Makefile b/target/linux/image/generic/lzma-loader/Makefile index daa83535e9..089254bbaf 100644 --- a/target/linux/image/generic/lzma-loader/Makefile +++ b/target/linux/image/generic/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma @@ -21,10 +21,10 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma - cp $< $@ + $(CP) $< $@ $(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index b6396e66ab..c7d4335d8c 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -36,7 +36,7 @@ jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB jffs2-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: jffs2-prepare compile-targets: jffs2-compile diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile index d5f03bef4a..071bacdd47 100644 --- a/target/linux/image/jffs2/Makefile +++ b/target/linux/image/jffs2/Makefile @@ -18,7 +18,7 @@ $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util $(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(MTD_SOURCE) prepare: $(MTD_DIR)/.unpacked diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk index 7fe972a45e..0b39aa1611 100644 --- a/target/linux/image/squashfs.mk +++ b/target/linux/image/squashfs.mk @@ -28,7 +28,7 @@ squashfs-install: $(KDIR)/root.squashfs squashfs-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: squashfs-prepare compile-targets: squashfs-compile diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile index df21fd256c..77792565b3 100644 --- a/target/linux/image/squashfs/Makefile +++ b/target/linux/image/squashfs/Makefile @@ -17,7 +17,7 @@ $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacke $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma $(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) prepare: $(SQUASHFSLZMA_DIR)/.unpacked diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index 37600c91db..5820d022bc 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -6,7 +6,7 @@ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifeq ($(FS),jffs2-8MB) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS) - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img @@ -16,7 +16,7 @@ endif ifeq ($(FS),tgz) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz @@ -24,7 +24,7 @@ endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/bzImage - cp $^ $@ + $(CP) $^ $@ clean: @@ -33,4 +33,4 @@ compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile index 0ec71199c7..8ed7a5cc02 100644 --- a/target/linux/imagebuilder/Makefile +++ b/target/linux/imagebuilder/Makefile @@ -40,9 +40,9 @@ build: $(IPKG_KERNEL) install `ls packages/$${package}_*`; \ done if [ -d ./files ]; then \ - cp -a --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ fi if [ -d ./files.$(LIST) ]; then \ - cp -a --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ fi $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install diff --git a/target/linux/package/base-files/Makefile b/target/linux/package/base-files/Makefile index 994ce53388..637904c2e8 100644 --- a/target/linux/package/base-files/Makefile +++ b/target/linux/package/base-files/Makefile @@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root mkdir -p $(IDIR_OPENWRT)/sbin - cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin + $(CP) $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin $(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root endif @@ -36,7 +36,7 @@ $(IDIR_OPENWRT): $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control $(IPKG_OPENWRT): $(IDIR_OPENWRT) - [ -d files/$(BOARD)-$(KERNEL) ] && cp -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ + [ -d files/$(BOARD)-$(KERNEL) ] && $(CP) -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ find $(IDIR_OPENWRT) -name CVS | xargs rm -rf find $(IDIR_OPENWRT) -name .svn | xargs rm -rf $(RSTRIP) $(IDIR_OPENWRT) @@ -50,4 +50,4 @@ openwrt-install: compile-targets: install-dev $(IPKG_OPENWRT) install-dev: mkdir -p $(STAGING_DIR)/usr/include - cp -fpR ./include/[a-z]* $(STAGING_DIR)/usr/include/ + $(CP) ./include/[a-z]* $(STAGING_DIR)/usr/include/ diff --git a/target/linux/package/bcm43xx-dscape/Makefile b/target/linux/package/bcm43xx-dscape/Makefile index 5856bf7492..3c07e3daae 100644 --- a/target/linux/package/bcm43xx-dscape/Makefile +++ b/target/linux/package/bcm43xx-dscape/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/fwcutter/.built: mkdir -p $(PKG_BUILD_DIR)/fwcutter - cp ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ + $(CP) ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ $(SCRIPT_DIR)/download.pl "$(PKG_BUILD_DIR)/fwcutter" "$(FIRMWARE_BLOB)" "$(FIRMWARE_BLOB_MD5SUM)" $(FIRMWARE_BLOB_URL) $(MAKE) -C $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/fwcutter -w $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/$(FIRMWARE_BLOB) @@ -50,7 +50,7 @@ $(IPKG_KMOD_BCM43XX_DSCAPE): echo rate_control; \ echo bcm43xx; \ ) >& $(IDIR_KMOD_BCM43XX_DSCAPE)/etc/modules.d/50-bcm43xx - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware - cp -fpR $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ + $(CP) $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ $(IPKG_BUILD) $(IDIR_KMOD_BCM43XX_DSCAPE) $(PACKAGE_DIR) diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile index 26bdcc952f..3329ee9852 100644 --- a/target/linux/package/diag/Makefile +++ b/target/linux/package/diag/Makefile @@ -27,5 +27,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_DIAG): mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR) diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile index 62d6df36d9..b9a57d002d 100644 --- a/target/linux/package/fuse/Makefile +++ b/target/linux/package/fuse/Makefile @@ -74,7 +74,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_FUSE): mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) diff --git a/target/linux/package/hostap/Makefile b/target/linux/package/hostap/Makefile index ac031e3bc9..3e8e604984 100644 --- a/target/linux/package/hostap/Makefile +++ b/target/linux/package/hostap/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_HOSTAP): install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \ @@ -44,14 +44,14 @@ $(IPKG_KMOD_HOSTAP): $(IPKG_KMOD_HOSTAP_PCI): install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR) $(IPKG_KMOD_HOSTAP_PLX): install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR) diff --git a/target/linux/package/ieee80211-dscape/Makefile b/target/linux/package/ieee80211-dscape/Makefile index 90fe09d3d8..3de9b34fb8 100644 --- a/target/linux/package/ieee80211-dscape/Makefile +++ b/target/linux/package/ieee80211-dscape/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_IEEE80211_DSCAPE,$(PKG_NAME),$(LINUX_VERSION)-$( $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -32,12 +32,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_IEEE80211_DSCAPE): install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) #install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_IEEE80211_DSCAPE) $(PACKAGE_DIR) install-dev: mkdir -p $(STAGING_DIR)/usr/include/ieee80211-dscape - cp -fpR src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ + $(CP) src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/ieee80211-dscape diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile index da94415408..eabbdd0f2b 100644 --- a/target/linux/package/madwifi/Makefile +++ b/target/linux/package/madwifi/Makefile @@ -77,20 +77,20 @@ $(IPKG_KMOD_MADWIFI): mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi - cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \ $(BUS_MODULES) \ $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ - cp -fpR $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/madwifi - cp -fpR $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ + $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211 - cp -fpR $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ + $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ touch $@ install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile index 6fea0655d0..dcd5b91f3a 100644 --- a/target/linux/package/mini_fo/Makefile +++ b/target/linux/package/mini_fo/Makefile @@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_MINI_FO): install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/ echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR) diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile index e7faf3e361..9c1b1829f8 100644 --- a/target/linux/package/openswan/Makefile +++ b/target/linux/package/openswan/Makefile @@ -32,5 +32,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_OPENSWAN): mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR) diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile index a0ac839479..4625bdb12e 100644 --- a/target/linux/package/shfs/Makefile +++ b/target/linux/package/shfs/Makefile @@ -40,7 +40,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SHFS): install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) diff --git a/target/linux/package/spca5xx/Makefile b/target/linux/package/spca5xx/Makefile index 95ffe5966f..6b66262a2f 100644 --- a/target/linux/package/spca5xx/Makefile +++ b/target/linux/package/spca5xx/Makefile @@ -33,7 +33,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SPCA5XX): install -m0755 -d $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_SPCA5XX) $(IPKG_BUILD) $(IDIR_KMOD_SPCA5XX) $(PACKAGE_DIR) diff --git a/target/linux/package/switch/Makefile b/target/linux/package/switch/Makefile index c86147930e..812fccb2cc 100644 --- a/target/linux/package/switch/Makefile +++ b/target/linux/package/switch/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(P $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -31,7 +31,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SWITCH): install -m0755 -d $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR) diff --git a/target/linux/package/ueagle-atm/Makefile b/target/linux/package/ueagle-atm/Makefile index 2da1f463e1..3872727f59 100644 --- a/target/linux/package/ueagle-atm/Makefile +++ b/target/linux/package/ueagle-atm/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_UEAGLE_ATM): install -m0755 -d $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION) $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d install -m0644 ./files/$(PKG_NAME).modules $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d/10-$(PKG_NAME) - cp -fpR $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_UEAGLE_ATM) diff --git a/target/linux/package/wlcompat/Makefile b/target/linux/package/wlcompat/Makefile index 718b584aae..cdc02ea229 100644 --- a/target/linux/package/wlcompat/Makefile +++ b/target/linux/package/wlcompat/Makefile @@ -33,11 +33,11 @@ $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o mkdir -p $(IDIR_KMOD_WLCOMPAT)/etc/modules.d echo "wlcompat" > $(IDIR_KMOD_WLCOMPAT)/etc/modules.d/30-wlcompat mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR) $(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o mkdir -p $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR) diff --git a/target/linux/rules.mk b/target/linux/rules.mk index c9cf9c5e5f..f0f2e72dbb 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -68,7 +68,7 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) endif ifneq ($(6),) mkdir -p $$(I_$(1))/etc/modules.d diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index 97ded843f7..5f20f1e406 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -19,12 +19,12 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 3bb8c4d231..45a2e1c492 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -14,12 +14,12 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/lzma/Makefile b/target/lzma/Makefile index 8969e3d241..6e846c31c9 100644 --- a/target/lzma/Makefile +++ b/target/lzma/Makefile @@ -32,7 +32,7 @@ $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked touch $@ lzma: $(TARGETS) - cp -f $^ $(LZMA_DIR) + $(CP) $^ $(LZMA_DIR) lzma-source: $(DL_DIR)/$(LZMA_SOURCE) @@ -49,5 +49,5 @@ lzma-dirclean: prepare: $(LZMA_DIR)/.unpacked compile: lzma install: lzma - cp $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ + $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ clean: lzma-dirclean diff --git a/target/utils/Makefile b/target/utils/Makefile index c08bd1a55d..753db53deb 100644 --- a/target/utils/Makefile +++ b/target/utils/Makefile @@ -7,7 +7,7 @@ UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) mkdir -p $(STAGING_DIR)/bin - cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ + $(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ install: compile package: clean: diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 642662e8f1..2d24cdd13e 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -187,7 +187,7 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) echo staging dir specs file is missing ; \ /bin/false ; \ fi; - cp ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs + $(CP) ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif # We do another ugly hack here because the standard behaviour is diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 9f466d321d..27da1d5e9f 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -38,7 +38,7 @@ $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) touch $(LINUX_HEADERS_DIR)/.unpacked $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked - -cp -af ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config + -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config $(MAKE) -C $(LINUX_HEADERS_DIR) ARCH=$(LINUX_HEADERS_ARCH) oldconfig include/linux/version.h touch $(LINUX_HEADERS_DIR)/.configured diff --git a/toolchain/libnotimpl/Makefile b/toolchain/libnotimpl/Makefile index 9ae2bf2407..f68346c371 100644 --- a/toolchain/libnotimpl/Makefile +++ b/toolchain/libnotimpl/Makefile @@ -17,7 +17,7 @@ $(LIBNOTIMPL_DIR)/libnotimpl.a: $(LIBNOTIMPL_OBJS) $(STAGING_DIR)/usr/lib/libnotimpl.a: $(LIBNOTIMPL_DIR)/libnotimpl.a mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $< $@ + $(CP) $< $@ touch -c $@ source: diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 82c979c871..d77f554a12 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -47,7 +47,7 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak - cp ./files/config.$(ARCH) $(UCLIBC_DIR)/.config + $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ $(UCLIBC_DIR)/.config ifeq ($(BR2_LARGEFILE),y) diff --git a/toolchain/utils/Makefile b/toolchain/utils/Makefile index b5dae73476..2af6b139df 100644 --- a/toolchain/utils/Makefile +++ b/toolchain/utils/Makefile @@ -12,7 +12,7 @@ prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) install: compile mkdir -p $(STAGING_DIR)/bin - cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ + $(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ package: clean: rm -rf $(UTILS_BUILD_DIR)