From 33631ab9ffe67839bba7b703b754f601c5b9039f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 7 Dec 2020 18:59:29 -0800 Subject: [PATCH] libdaq: fix config file Install to host to fix compilation with depending packages. Fix paths to point to OpenWrt and not OS. Don't install to device. This is strictly an InstallDev thing. Signed-off-by: Rosen Penev --- libs/libdaq/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/libdaq/Makefile b/libs/libdaq/Makefile index 2f37f00c27..808c78472a 100644 --- a/libs/libdaq/Makefile +++ b/libs/libdaq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq PKG_VERSION:=2.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/ PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz @@ -53,6 +53,9 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/ $(INSTALL_DIR) $(STAGING_DIR)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/ + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/daq-modules-config + $(INSTALL_DIR) $(2)/bin + $(LN) ../../usr/bin/daq-modules-config $(2)/bin/daq-modules-config endef define Package/libdaq/install @@ -60,8 +63,6 @@ define Package/libdaq/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/daq $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/ - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(1)/usr/bin/ endef $(eval $(call BuildPackage,libdaq)) -- 2.30.2