diff --git a/libs/libdaq/Makefile b/libs/libdaq/Makefile index 808c78472..b4bd7d8e2 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:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/ PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz @@ -45,12 +45,12 @@ CONFIGURE_ARGS+= \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq - $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/ + $(INSTALL_DIR) $(STAGING_DIR)/usr/include/daq2 + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/daq2/ + $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/daq2/ + $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2/daq + $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq2/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 diff --git a/net/snort/Makefile b/net/snort/Makefile index 6802ba972..b5eeccc74 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort PKG_VERSION:=2.9.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=W. Michael Petullo @@ -58,8 +58,8 @@ CONFIGURE_ARGS += \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcre-includes="$(STAGING_DIR)/usr/include" \ --with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \ - --with-daq-includes="$(STAGING_DIR)/usr/include" \ - --with-daq-libraries="$(STAGING_DIR)/usr/lib" \ + --with-daq-includes="$(STAGING_DIR)/usr/include/daq2" \ + --with-daq-libraries="$(STAGING_DIR)/usr/lib/daq2" \ --disable-static-daq ifeq ($(CONFIG_SNORT_LZMA),)