diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-07 21:09:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 21:09:33 -0800 |
| commit | f0e0d88280827b0a17e14d70969c7e67e1434e5b (patch) | |
| tree | 0307a6f760e3857e952ac514338daf2c25c894dd | |
| parent | 48d6dd05c81d6046e7025c4ca12d25116bc73f73 (diff) | |
| parent | 33631ab9ffe67839bba7b703b754f601c5b9039f (diff) | |
Merge pull request #14169 from neheb/daq
libdaq: fix config file
| -rw-r--r-- | libs/libdaq/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/libdaq/Makefile b/libs/libdaq/Makefile index 2f37f00c2..808c78472 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)) |