From ac6415e61f147a6892fd2785337aec93ddc68fa9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 1 Sep 2017 01:11:17 +0200 Subject: [PATCH] dahdi-tools: package dahdi_cfg executable Grab the binary instead of the libtool-shell-wrapper... As a result, dahdi_cfg now depends on dahdi-tools-libtonezone. Signed-off-by: Daniel Golle dahdi-tools: fix previous commit The dependencies in the default section were modified instead of just the ones for dahdi-cfg. Fix that. Signed-off-by: Daniel Golle --- libs/dahdi-tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile index a7dd0ed..e9d991c 100644 --- a/libs/dahdi-tools/Makefile +++ b/libs/dahdi-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dahdi-tools PKG_VERSION:=2.11.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/ @@ -30,7 +30,7 @@ endef define Package/dahdi-cfg $(call Package/dahdi-cfg/Default) - DEPENDS+=+libpthread + DEPENDS+=+libpthread +dahdi-tools-libtonezone TITLE:=DAHDI tools dahdi_cfg, dahdi_scan and fxotune endef @@ -74,7 +74,7 @@ endef define Package/dahdi-cfg/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/dahdi_cfg $(1)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/ endef -- 2.30.2