Merge pull request #783 from tru7/patch-1
knxd: fix path in Makefile and some cleanups
This commit is contained in:
commit
9ec167918d
1 changed files with 6 additions and 8 deletions
|
@ -41,13 +41,15 @@ define Package/knxd
|
||||||
URL:=https://github.com/Makki1/knxd
|
URL:=https://github.com/Makki1/knxd
|
||||||
DEPENDS:=pthsem libusb-1.0
|
DEPENDS:=pthsem libusb-1.0
|
||||||
endef
|
endef
|
||||||
# use this if you want to support USB
|
|
||||||
# DEPENDS:=pthsem libusb-1.0
|
|
||||||
|
|
||||||
define Package/knxd/description
|
define Package/knxd/description
|
||||||
EIB KNX Daemon
|
EIB KNX Daemon
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Package/knxd/conffiles
|
||||||
|
/etc/config/knxd
|
||||||
|
endef
|
||||||
|
|
||||||
define Package/knxd-tools
|
define Package/knxd-tools
|
||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
|
@ -59,11 +61,11 @@ endef
|
||||||
define Package/knxd-tools/description
|
define Package/knxd-tools/description
|
||||||
EIB KNX Tools
|
EIB KNX Tools
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Prepare
|
define Build/Prepare
|
||||||
$(call Build/Prepare/Default)
|
$(call Build/Prepare/Default)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(call Build/Configure/Default,\
|
$(call Build/Configure/Default,\
|
||||||
--disable-ft12 \
|
--disable-ft12 \
|
||||||
|
@ -87,10 +89,6 @@ define Build/Compile
|
||||||
CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include"
|
CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include"
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/knxd/conffiles
|
|
||||||
/etc/config/knxd
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/knxd/install
|
define Package/knxd/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/server/knxd $(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/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/eibnetsearch $(1)/usr/bin/
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/eibnet/eibnetdescribe $(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_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
|
$(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
|
||||||
$(INSTALL_DIR) $(1)/etc/config
|
$(INSTALL_DIR) $(1)/etc/config
|
||||||
|
|
Loading…
Reference in a new issue