From: Philip Prindeville <redacted>
Date: Fri, 30 Mar 2018 15:14:40 +0000 (-0600)
Subject: isc-dhcp: make files/ consistent by flattening
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a35ebccb267c20ddb294070a45a846a7102df11b;p=openwrt-packages.git

isc-dhcp: make files/ consistent by flattening

Some /etc/config-destined files are in files/ and suffixed with
.conf while others are in files/etc/config/ which isn't consistent.
Put everything in files/ and call it good.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index a2b43530e..0f8593177 100644
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -196,7 +196,7 @@ define Package/isc-dhcp-relay-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/etc/config/dhcrelay $(1)/etc/config
+	$(INSTALL_DATA) ./files/dhcrelay.conf $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/dhcrelay4.init $(1)/etc/init.d/dhcrelay4
 endef
diff --git a/net/isc-dhcp/files/etc/config/dhcrelay b/net/isc-dhcp/files/dhcrelay.conf
similarity index 100%
rename from net/isc-dhcp/files/etc/config/dhcrelay
rename to net/isc-dhcp/files/dhcrelay.conf