rules: install to $datadir/suricata/rules

Common /usr/share/suricata/rules or /usr/local/share/suricata/rules.

The rules provided by the distribution are installed here as part
of the Suricata install process so will always be installed, even
without the use of install-rules.
pull/3368/head
Jason Ish 7 years ago committed by Victor Julien
parent de6fcb7c92
commit 7bf490062c

@ -2234,6 +2234,7 @@ if test "$WINDOWS_PATH" = "yes"; then
e_logdir="$e_winbase\\\\log" e_logdir="$e_winbase\\\\log"
e_logfilesdir="$e_logdir\\\\files" e_logfilesdir="$e_logdir\\\\files"
e_logcertsdir="$e_logdir\\\\certs" e_logcertsdir="$e_logdir\\\\certs"
e_datarulesdir="$e_winbase\\\\rules\\\\"
else else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/") EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
EXPAND_VARIABLE(localstatedir, e_rundir, "/run/") EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")
@ -2242,6 +2243,7 @@ else
EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/suricata/") EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/suricata/")
EXPAND_VARIABLE(sysconfdir, e_sysconfrulesdir, "/suricata/rules") EXPAND_VARIABLE(sysconfdir, e_sysconfrulesdir, "/suricata/rules")
EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata") EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
fi fi
AC_SUBST(e_logdir) AC_SUBST(e_logdir)
AC_SUBST(e_rundir) AC_SUBST(e_rundir)
@ -2254,6 +2256,7 @@ AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR])
AC_SUBST(e_magic_file) AC_SUBST(e_magic_file)
AC_SUBST(e_magic_file_comment) AC_SUBST(e_magic_file_comment)
AC_SUBST(e_enable_evelog) AC_SUBST(e_enable_evelog)
AC_SUBST(e_datarulesdir)
EXPAND_VARIABLE(prefix, CONFIGURE_PREFIX) EXPAND_VARIABLE(prefix, CONFIGURE_PREFIX)
EXPAND_VARIABLE(sysconfdir, CONFIGURE_SYSCONDIR) EXPAND_VARIABLE(sysconfdir, CONFIGURE_SYSCONDIR)

@ -1,4 +1,6 @@
EXTRA_DIST = \ ruledir = $(datadir)/suricata/rules
dist_rule_DATA = \
decoder-events.rules \ decoder-events.rules \
stream-events.rules \ stream-events.rules \
smtp-events.rules \ smtp-events.rules \

Loading…
Cancel
Save