dahdi-tools: fix previous commit

[feed/telephony.git] / libs / dahdi-tools / Makefile

diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile
index 572894b6231427d245899ae9c323a3563df4e490..e9d991c42fea95952d466c1a0a7791d2bb988c81 100644 (file)
--- 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
 
@@ -60,13 +60,13 @@ define Build/Compile
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                DAHDI_INCLUDE="$(STAGING_DIR)/usr/include" \
                CONFIGURE_SILENT="--silent" \
-               dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune libs
+               dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune
 endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.so $(1)/usr/lib/
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.a $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/*.so* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/*.a $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/include/dahdi
        $(CP) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/
@@ -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
@@ -88,8 +88,8 @@ endef
 
 define Package/dahdi-tools-libtonezone/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.so $(1)/usr/lib/
-       cd $(1)/usr/lib/; ln -s libtonezone.so libtonezone.so.2.0
+       $(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so.2.0.0 $(1)/usr/lib/
+       cd $(1)/usr/lib/; ln -s libtonezone.so.2.0.0 libtonezone.so; ln -s libtonezone.so.2.0.0 libtonezone.so.2
 endef
 
 $(eval $(call BuildPackage,dahdi-cfg))