aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-01-16 08:34:39 +0100
committerSteven Barth <steven@midlink.org>2015-01-16 08:34:39 +0100
commit9ec167918d98203bf05d44f78ee1e82506daf31b (patch)
treef1ce9c3a9634ff00972dc6596c325000d108e294 /net
parentfa8a8f91e69c82f39763b377379eec3c778f68ad (diff)
parente1a0360f937ac7961cce5960b9bcb38fb9185051 (diff)
Merge pull request #783 from tru7/patch-1
knxd: fix path in Makefile and some cleanups
Diffstat (limited to 'net')
-rw-r--r--net/knxd/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 030f0a3c5..9030b98f7 100644
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -41,13 +41,15 @@ define Package/knxd
URL:=https://github.com/Makki1/knxd
DEPENDS:=pthsem libusb-1.0
endef
-# use this if you want to support USB
-# DEPENDS:=pthsem libusb-1.0
define Package/knxd/description
EIB KNX Daemon
endef
+define Package/knxd/conffiles
+/etc/config/knxd
+endef
+
define Package/knxd-tools
SECTION:=net
CATEGORY:=Network
@@ -59,11 +61,11 @@ endef
define Package/knxd-tools/description
EIB KNX Tools
endef
+
define Build/Prepare
$(call Build/Prepare/Default)
endef
-
define Build/Configure
$(call Build/Configure/Default,\
--disable-ft12 \
@@ -87,10 +89,6 @@ define Build/Compile
CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include"
endef
-define Package/knxd/conffiles
- /etc/config/knxd
-endef
-
define Package/knxd/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/server/knxd $(1)/usr/bin/
@@ -98,7 +96,7 @@ define Package/knxd/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/bcu/bcuread $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/eibnet/eibnetsearch $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/eibnet/eibnetdescribe $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/eibnet/findknxusb $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usb/findknxusb $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
$(INSTALL_DIR) $(1)/etc/config