mosquitto: use mirrored files/ tree

Instead of manually copying files and renaming on install, use the nice
clean "files/<mirror>" structure and just $(CP) them into place.

Signed-off-by: Karl Palsson <redacted>

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index e8c4672c4c9a9c7b4e289f33abec59de9c0fa60d..b407d03afaf6c8ed44ab0cd5cb7ef9b0bbfe1bc4 100644 (file)
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -160,10 +160,7 @@ define Package/mosquitto/install/default
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
        $(INSTALL_DIR) $(1)/etc/mosquitto
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/mosquitto.init $(1)/etc/init.d/mosquitto
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) ./files/mosquitto.uci.convert $(1)/usr/bin
+       $(CP) ./files/* $(1)/
 endef
 
 define Package/mosquitto-nossl/install

diff --git a/net/mosquitto/files/mosquitto.init b/net/mosquitto/files/etc/init.d/mosquitto
similarity index 100%
rename from net/mosquitto/files/mosquitto.init
rename to net/mosquitto/files/etc/init.d/mosquitto

diff --git a/net/mosquitto/files/mosquitto.uci.convert b/net/mosquitto/files/usr/bin/mosquitto.uci.convert
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from net/mosquitto/files/mosquitto.uci.convert
rename to net/mosquitto/files/usr/bin/mosquitto.uci.convert