Merge pull request #318 from ecsv/batadv-2017.2-ftbfs

batman-adv: Prevent FTBFS when redefining ether_setup

diff --git a/nodogsplash2/Makefile b/nodogsplash2/Makefile
index f8a2344b989f3bffff5a7ddd8a3b68aa3ed75083..ccebc7896347260f9fa040f7bc50c10775ff95eb 100644 (file)
--- a/nodogsplash2/Makefile
+++ b/nodogsplash2/Makefile
@@ -48,10 +48,10 @@ define Package/nodogsplash2/install
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) files/nodogsplash.config $(1)/etc/config/nodogsplash
 
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/htdocs/images
-       $(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/$(PKG_NAME)/htdocs/
-       $(CP) $(PKG_BUILD_DIR)/resources/infoskel.html $(1)/etc/$(PKG_NAME)/htdocs/
-       $(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/$(PKG_NAME)/htdocs/images/
+       $(INSTALL_DIR) $(1)/etc/nodogsplash/htdocs/images
+       $(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/nodogsplash/htdocs/
+       $(CP) $(PKG_BUILD_DIR)/resources/infoskel.html $(1)/etc/nodogsplash/htdocs/
+       $(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/nodogsplash/htdocs/images/
 endef
 
 define Package/nodogsplash2/conffiles