From: Karl Palsson <redacted>
Date: Thu, 3 Mar 2016 13:41:49 +0000 (+0000)
Subject: mosquitto: use mirrored files/ tree
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=39ea72b18662c3b977af5c0c4ef428b4475cfb21;p=openwrt-packages.git

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 e8c4672c4..b407d03af 100644
--- 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
new mode 100755
similarity index 100%
rename from net/mosquitto/files/mosquitto.uci.convert
rename to net/mosquitto/files/usr/bin/mosquitto.uci.convert