From babc530fc798575678c56fcd5a87787fa9ffb6fd Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:28:13 +0100 Subject: [PATCH] dahdi-tools: update install defines - use $(INSTALL_BIN) and $(INSTALL_DATA) where possible. - instead of creating symlinks manually just copy them. Signed-off-by: Sebastian Kemper --- libs/dahdi-tools/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile index e9a7cb9..5ad82a8 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:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases @@ -61,27 +61,26 @@ define Build/InstallDev $(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/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/ endef define Package/dahdi-cfg/install $(INSTALL_DIR) $(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/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/ endef define Package/dahdi-monitor/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/dahdi_monitor $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/dahdi_speed $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_monitor $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_speed $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/ endef define Package/dahdi-tools-libtonezone/install $(INSTALL_DIR) $(1)/usr/lib - $(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 + $(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,dahdi-cfg)) -- 2.30.2