Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next/639/20241113/v1 #12117

Merged
merged 10 commits into from
Nov 14, 2024
Prev Previous commit
make: install-headers: rust-bindings.h
rust-bindings.h was not being installed with "make install-headers",
and its now pulled in by a header used for plugin support, so make
sure its installed.

We first attempt to install the "dist" version if exists, otherwise
install the "gen" one. Also install the "gen" even if the "dist" one
exists, as its going to be newer.
jasonish authored and victorjulien committed Nov 13, 2024
commit 5d766df12b54a805cf1d7eef47d1c174a340ed5b
6 changes: 6 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1174,6 +1174,12 @@ install-headers:
for header in $(noinst_HEADERS); do \
$(INSTALL_DATA) $$header "$(DESTDIR)${includedir}/suricata"; \
done
if test -e ../rust/dist/rust-bindings.h; then \
$(INSTALL_DATA) ../rust/dist/rust-bindings.h "$(DESTDIR)${includedir}/suricata"; \
fi
if test -e ../rust/gen/rust-bindings.h; then \
$(INSTALL_DATA) ../rust/gen/rust-bindings.h "$(DESTDIR)${includedir}/suricata"; \
fi

# Until we can remove autoconf.h from our headers, we need to to
# provide this for library/plugin users.