From: Jason Ish <ish@unx.ca>
Date: Thu, 26 Apr 2018 13:15:39 +0000 (-0600)
Subject: rules: install to $datadir/suricata/rules
X-Git-Tag: suricata-4.1.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bf490062c7998fd76213d945f3bd2a3edf12fee;p=thirdparty%2Fsuricata.git

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.
---

diff --git a/configure.ac b/configure.ac
index 6833acb411..66b09a9f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2234,6 +2234,7 @@ if test "$WINDOWS_PATH" = "yes"; then
     e_logdir="$e_winbase\\\\log"
     e_logfilesdir="$e_logdir\\\\files"
     e_logcertsdir="$e_logdir\\\\certs"
+    e_datarulesdir="$e_winbase\\\\rules\\\\"
 else
     EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
     EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")
@@ -2242,6 +2243,7 @@ else
     EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/suricata/")
     EXPAND_VARIABLE(sysconfdir, e_sysconfrulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
+    EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
 fi
 AC_SUBST(e_logdir)
 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_comment)
 AC_SUBST(e_enable_evelog)
+AC_SUBST(e_datarulesdir)
 
 EXPAND_VARIABLE(prefix, CONFIGURE_PREFIX)
 EXPAND_VARIABLE(sysconfdir, CONFIGURE_SYSCONDIR)
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 345b46d9a4..9deeae5b82 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = \
+ruledir = $(datadir)/suricata/rules
+
+dist_rule_DATA = \
 decoder-events.rules \
 stream-events.rules \
 smtp-events.rules \