From 92b0575e28de89d77300c8163f1a74e3afdeddb4 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 12 Mar 2016 01:10:04 +0800 Subject: 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 --- net/znc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'net/znc/Makefile') diff --git a/net/znc/Makefile b/net/znc/Makefile index 00d42ccc9..97c354b89 100644 --- 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 -- cgit v1.2.3