yate: update install define 284/head
authorSebastian Kemper <sebastian_ml@gmx.net>
Sat, 24 Feb 2018 10:37:46 +0000 (11:37 +0100)
committerSebastian Kemper <sebastian_ml@gmx.net>
Sat, 24 Feb 2018 10:37:48 +0000 (11:37 +0100)
- Simplify lib install
- Use $(INSTALL_CONF) for config files

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
net/yate/Makefile

index 376970c3a70a6121530184326768f9a247495d23..f57a6e78bc432774ede33885180ade9e58574885 100644 (file)
@@ -8,11 +8,9 @@
 
 include $(TOPDIR)/rules.mk
 
-RELEASEVER:=6.0.0
-
 PKG_NAME:=yate
-PKG_VERSION:=$(RELEASEVER)-1
-PKG_RELEASE:=4
+PKG_VERSION:=6.0.0-1
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/
@@ -125,14 +123,13 @@ define Package/$(PKG_NAME)/install
        $(INSTALL_DIR) $(1)/usr/lib
        
        for yatelib in "" asn sig mgcp jabber script; do \
-               $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\
-               $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\
+               $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so* $(1)/usr/lib ;\
        done
        
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yate $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf $(1)/etc/$(PKG_NAME)/yate.conf
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/yate/yate.conf $(1)/etc/$(PKG_NAME)/yate.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/yate.init $(1)/etc/init.d/yate
 endef
@@ -178,7 +175,7 @@ $(if $(6),/etc/yate/$(1).conf)
        $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/yate/$(2)/$(1).yate $$(1)/usr/lib/yate/$(2)/$(1).yate
        if [ -f $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf ]; then \
                $$(INSTALL_DIR) $$(1)/etc/yate ;\
-               $$(INSTALL_DATA) $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf $$(1)/etc/yate/ ;\
+               $$(INSTALL_CONF) $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf $$(1)/etc/yate/ ;\
        fi
        $(if $(5),$(foreach extra_file,$(5),\
                $(INSTALL_DIR) $$(1)$(dir $(extra_file)) ; \