From cc84bb49a6f52e6beebe2f29ccc58e93de265819 Mon Sep 17 00:00:00 2001
From: Yalu Zhang <yalu.zhang@iopsys.eu>
Date: Tue, 15 Jan 2019 17:22:57 +0100
Subject: [PATCH] Install libhelper and libsysfapi properly

---
 fapi_system/Makefile | 8 ++++++++
 libhelper/Makefile   | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/fapi_system/Makefile b/fapi_system/Makefile
index f16ab1f..0ffb915 100755
--- a/fapi_system/Makefile
+++ b/fapi_system/Makefile
@@ -212,8 +212,14 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/
 endef
 
+define Build/UninstallDev
+	- rm -f $(1)/usr/lib/libsysfapi*.*
+	- rm -f $(1)/usr/lib/libethfapi*.*
+endef
+
 # To ipkg / Rootfs
 define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/$(VENDOR_PATH)/usr/lib
 ifeq ($(CONFIG_TARGET_lantiq_xrx200),y)
 	$(INSTALL_DIR) $(1)/$(VENDOR_PATH)/etc/
@@ -222,7 +228,9 @@ ifeq ($(CONFIG_TARGET_lantiq_xrx330),y)
 	$(INSTALL_DIR) $(1)/$(VENDOR_PATH)/etc/
 endif
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libsysfapi.so $(1)/$(VENDOR_PATH)/usr/lib/
+	cd $(1)/usr/lib && rm -f "libsysfapi.so*" && ln -s "../../$(VENDOR_PATH)/usr/lib/libsysfapi.so" "libsysfapi.so"
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libethfapi.so $(1)/$(VENDOR_PATH)/usr/lib/
+	cd $(1)/usr/lib && rm -f "libethfapi.so*" && ln -s "../../$(VENDOR_PATH)/usr/lib/libethfapi.so" "libethfapi.so"
 ifneq ($(CONFIG_LANTIQ_OPENWRT_FIRMWARE),y)
 ifeq ($(CONFIG_TARGET_lantiq_xrx200),y)
 	$(CP) ./files/etc/* $(1)/$(VENDOR_PATH)/etc/
diff --git a/libhelper/Makefile b/libhelper/Makefile
index 88c811b..5452d7a 100644
--- a/libhelper/Makefile
+++ b/libhelper/Makefile
@@ -77,9 +77,15 @@ define Build/InstallDev
 	$(RM) $(1)/usr/docs/list.h
 endef
 
+define Build/UninstallDev
+	- rm -f $(1)/usr/lib/libhelper*.*
+endef
+
 define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/$(VENDOR_PATH)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libhelper.so $(1)/$(VENDOR_PATH)/usr/lib/
+	cd $(1)/usr/lib && rm -f "libhelper.so*" && ln -s "../../$(VENDOR_PATH)/usr/lib/libhelper.so" "libhelper.so"
 endef
 
 define Build/Clean
-- 
GitLab