Drop the redundant -r option to $(CP)

$(CP) was defined as `cp -fpR' since the very begining of OpenWrt build
system (2006-06-22).  The -R option should be enough and base packages
use only $(CP) for the same purposes just fine and BSD manual of cp also
discourages the use of `-r' option.  So let's just tidy up the usage now.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
index 82310d4c28dcf62a00f56d9a312afca95e0165f1..062c56773d69de892eff4c45c2b109722838c02b 100644 (file)
--- a/lang/node-arduino-firmata/Makefile
+++ b/lang/node-arduino-firmata/Makefile
@@ -60,7 +60,7 @@ define Package/node-arduino-firmata/install
        mkdir -p $(1)/usr/lib/node
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node
        rm -rf $(1)/usr/lib/node/arduino-firmata/node_modules/serialport/ 
-       $(CP) -r ./files/* $(1)/
+       $(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,node-arduino-firmata))

diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
index d2e40b277061740b41734747ed922b4517c38661..786721eb2a9e78c124afda97c9cea2ffb630e4b8 100644 (file)
--- a/lang/node-cylon/Makefile
+++ b/lang/node-cylon/Makefile
@@ -73,22 +73,22 @@ endef
 
 define Package/node-cylon/install
        mkdir -p $(1)/usr/lib/node/cylon
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
 endef
 
 define Package/node-cylon-i2c/install
        mkdir -p $(1)/usr/lib/node/cylon-i2c
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
 endef
 
 define Package/node-cylon-gpio/install
        mkdir -p $(1)/usr/lib/node/cylon-gpio
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
 endef
 
 define Package/node-cylon-firmata/install
        mkdir -p $(1)/usr/lib/node/cylon-firmata
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
 endef
 
 $(eval $(call BuildPackage,node-cylon))

diff --git a/libs/poco/Makefile b/libs/poco/Makefile
index 6fbf831b4c7a18bc009eb39aa7deceba6f491239..d607302ae21519626e9104056e62dee7f7d50760 100644 (file)
--- a/libs/poco/Makefile
+++ b/libs/poco/Makefile
@@ -55,7 +55,7 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/
 
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 72b99b62730cb018ffe8b0574602edaa7eb54ac4..d7e988323ccd258424d9fce5fe6681820b77b47f 100644 (file)
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -207,13 +207,12 @@ define Package/pgsql-server/install
 
        $(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
 
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/share/postgresql/* \
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/postgresql/* \
                $(1)/usr/share/postgresql
 
        $(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/postgresql
 
-       $(CP) -r \
-               $(PKG_INSTALL_DIR)/usr/lib/postgresql \
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/postgresql \
                $(1)/usr/lib
 endef
 

diff --git a/net/znc/Makefile b/net/znc/Makefile
index 00d42ccc96965aca66af7222998bf846cea37208..97c354b89ea5e44cc5319f007d0e993db741df2f 100644 (file)
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -81,7 +81,7 @@ define module
        # include webadmin page templates if existing
        if [ -d $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) ]; then \
                $(INSTALL_DIR) $$(1)/usr/share/znc/modules ;\
-               $(CP) -r $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\
+               $(CP) $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\
        fi
   endef
 
@@ -104,9 +104,9 @@ define webadmin
        $(INSTALL_DIR) $$(1)/usr/lib/znc/
        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/
        $(INSTALL_DIR) $$(1)/usr/share/znc/modules
-       $(CP) -r $$(PKG_BUILD_DIR)/modules/data/webadmin $$(1)/usr/share/znc/modules
+       $(CP) $$(PKG_BUILD_DIR)/modules/data/webadmin $$(1)/usr/share/znc/modules
        $(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-       $(CP) -r $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/
+       $(CP) $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/
   endef
 
   ZNC_MODULES += znc-mod-webadmin
@@ -126,7 +126,7 @@ define webskin
 
   define Package/znc-webskin-$(strip $(1))/install
        $(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-       $(CP) -r $$(PKG_BUILD_DIR)/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/
+       $(CP) $$(PKG_BUILD_DIR)/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/
   endef
   ZNC_MODULES += znc-webskin-$(strip $(1))
 endef

diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile
index 42b98fa730a017cd24ddb0ef6471dbdb0770f32b..9c2c1cc95256c4d2da5b78277b67addb7405fb9a 100644 (file)
--- a/sound/upmpdcli/Makefile
+++ b/sound/upmpdcli/Makefile
@@ -54,7 +54,7 @@ endif
 ifneq ($(CONFIG_PACKAGE_UPMPDCLI_SC_WEB_INTERFACE),y)
        $(RM) -rf $(PKG_INSTALL_DIR)/usr/share/upmpdcli/web
 endif
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/share/upmpdcli $(1)/usr/share/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/upmpdcli $(1)/usr/share/
        $(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli

diff --git a/utils/acl/Makefile b/utils/acl/Makefile
index d7e7a572e29e14433f862fdf082dd4268d2b1f6e..ab4e938413361edf66ab8999a87d5b87376178d4 100644 (file)
--- a/utils/acl/Makefile
+++ b/utils/acl/Makefile
@@ -81,7 +81,7 @@ endef
 define Build/InstallDev
        mkdir -p $(1)/usr/include
        mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
+       $(CP) $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
 endef
 
 $(eval $(call BuildPackage,acl))

diff --git a/utils/attr/Makefile b/utils/attr/Makefile
index bdbfc584ad3f873e637d0054d0eb8e00c78d09ea..dca9deb08a6d35b61c127ed1a925415915746461 100644 (file)
--- a/utils/attr/Makefile
+++ b/utils/attr/Makefile
@@ -86,7 +86,7 @@ endef
 define Build/InstallDev
        mkdir -p $(1)/usr/include
        mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
+       $(CP) $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
 endef
 
 $(eval $(call BuildPackage,attr))

diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
index d173f157c51aaf42f2debe977750c07a75056d73..71650ad93f60e7cd07a817373c0a120182ce727e 100644 (file)
--- a/utils/gammu/Makefile
+++ b/utils/gammu/Makefile
@@ -48,7 +48,7 @@ endif
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/gammu $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gammu $(1)/usr/include/
        mkdir -p $(1)/usr/lib
        $(CP)    $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/
 endef