LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #2486 from yousong/cp-fix 

Drop the redundant -r option to $(CP)
lilik-openwrt-22.03
champtar 9 years ago
parent
7c3620439d 92b0575e28
commit
fb744a6581
9 changed files with 16 additions and 17 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      lang/node-arduino-firmata/Makefile
  2. +4
    -4
      lang/node-cylon/Makefile
  3. +1
    -1
      libs/poco/Makefile
  4. +2
    -3
      libs/postgresql/Makefile
  5. +4
    -4
      net/znc/Makefile
  6. +1
    -1
      sound/upmpdcli/Makefile
  7. +1
    -1
      utils/acl/Makefile
  8. +1
    -1
      utils/attr/Makefile
  9. +1
    -1
      utils/gammu/Makefile

+ 1
- 1
lang/node-arduino-firmata/Makefile View File

@ -61,7 +61,7 @@ define Package/node-arduino-firmata/install
mkdir -p $(1)/usr/lib/node mkdir -p $(1)/usr/lib/node
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(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/ rm -rf $(1)/usr/lib/node/arduino-firmata/node_modules/serialport/
$(CP) -r ./files/* $(1)/
$(CP) ./files/* $(1)/
endef endef
$(eval $(call BuildPackage,node-arduino-firmata)) $(eval $(call BuildPackage,node-arduino-firmata))


+ 4
- 4
lang/node-cylon/Makefile View File

@ -74,22 +74,22 @@ endef
define Package/node-cylon/install define Package/node-cylon/install
mkdir -p $(1)/usr/lib/node/cylon 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 endef
define Package/node-cylon-i2c/install define Package/node-cylon-i2c/install
mkdir -p $(1)/usr/lib/node/cylon-i2c 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 endef
define Package/node-cylon-gpio/install define Package/node-cylon-gpio/install
mkdir -p $(1)/usr/lib/node/cylon-gpio 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 endef
define Package/node-cylon-firmata/install define Package/node-cylon-firmata/install
mkdir -p $(1)/usr/lib/node/cylon-firmata 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 endef
$(eval $(call BuildPackage,node-cylon)) $(eval $(call BuildPackage,node-cylon))


+ 1
- 1
libs/poco/Makefile View File

@ -55,7 +55,7 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(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 $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/


+ 2
- 3
libs/postgresql/Makefile View File

@ -207,13 +207,12 @@ define Package/pgsql-server/install
$(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql $(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 $(1)/usr/share/postgresql
$(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/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 $(1)/usr/lib
endef endef


+ 4
- 4
net/znc/Makefile View File

@ -81,7 +81,7 @@ define module
# include webadmin page templates if existing # include webadmin page templates if existing
if [ -d $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) ]; then \ if [ -d $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) ]; then \
$(INSTALL_DIR) $$(1)/usr/share/znc/modules ;\ $(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 fi
endef endef
@ -104,9 +104,9 @@ define webadmin
$(INSTALL_DIR) $$(1)/usr/lib/znc/ $(INSTALL_DIR) $$(1)/usr/lib/znc/
$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/
$(INSTALL_DIR) $$(1)/usr/share/znc/modules $(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/ $(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 endef
ZNC_MODULES += znc-mod-webadmin ZNC_MODULES += znc-mod-webadmin
@ -126,7 +126,7 @@ define webskin
define Package/znc-webskin-$(strip $(1))/install define Package/znc-webskin-$(strip $(1))/install
$(INSTALL_DIR) $$(1)/usr/share/znc/webskins/ $(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 endef
ZNC_MODULES += znc-webskin-$(strip $(1)) ZNC_MODULES += znc-webskin-$(strip $(1))
endef endef


+ 1
- 1
sound/upmpdcli/Makefile View File

@ -54,7 +54,7 @@ endif
ifneq ($(CONFIG_PACKAGE_UPMPDCLI_SC_WEB_INTERFACE),y) ifneq ($(CONFIG_PACKAGE_UPMPDCLI_SC_WEB_INTERFACE),y)
$(RM) -rf $(PKG_INSTALL_DIR)/usr/share/upmpdcli/web $(RM) -rf $(PKG_INSTALL_DIR)/usr/share/upmpdcli/web
endif 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_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli $(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli


+ 1
- 1
utils/acl/Makefile View File

@ -81,7 +81,7 @@ endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include mkdir -p $(1)/usr/include
mkdir -p $(1)/usr/lib/pkgconfig 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 endef
$(eval $(call BuildPackage,acl)) $(eval $(call BuildPackage,acl))


+ 1
- 1
utils/attr/Makefile View File

@ -86,7 +86,7 @@ endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include mkdir -p $(1)/usr/include
mkdir -p $(1)/usr/lib/pkgconfig 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 endef
$(eval $(call BuildPackage,attr)) $(eval $(call BuildPackage,attr))


+ 1
- 1
utils/gammu/Makefile View File

@ -48,7 +48,7 @@ endif
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include 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 mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/
endef endef


Write Preview
Loading…
Cancel
Save