configure: rename e_localstatedir to e_pkgstatedir

e_localstatedir is actually localstatedir expanded with a package
specific suffix, so give it the more appropriately names
e_pkgstatedir. This will free up e_localstatedir to be just the
expanded version of localstatedir.

Makefile.am

@@ -35,7 +35,7 @@ install-conf:
 	install -d "$(DESTDIR)$(e_logfilesdir)"
 	install -d "$(DESTDIR)$(e_logcertsdir)"
 	install -d "$(DESTDIR)$(e_rundir)"
-	install -m 770 -d "$(DESTDIR)$(e_localstatedir)"
+	install -m 770 -d "$(DESTDIR)$(e_pkgstatedir)"
 	install -m 770 -d "$(DESTDIR)$(e_datadir)"
 
 install-rules:

configure.ac

@@ -2493,7 +2493,7 @@ else
     EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")
     EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")
     EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/suricata/")
-    EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
+    EXPAND_VARIABLE(localstatedir, e_pkgstatedir, "/run/suricata")
     EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_datadir, "/lib/suricata/data")
     EXPAND_VARIABLE(localstatedir, e_defaultruledir, "/lib/suricata/rules")
@@ -2507,7 +2507,7 @@ AC_SUBST(e_logfilesdir)
 AC_SUBST(e_logcertsdir)
 AC_SUBST(e_sysconfdir)
 AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR])
-AC_SUBST(e_localstatedir)
+AC_SUBST(e_pkgstatedir)
 AC_DEFINE_UNQUOTED([LOCAL_STATE_DIR],["$localstatedir"],[Our LOCAL_STATE_DIR])
 AC_SUBST(e_datadir)
 AC_DEFINE_UNQUOTED([DATA_DIR],["$e_datadir"],[Our DATA_DIR])

python/suricata/config/defaults.py.in

@@ -1,3 +1,3 @@
 sysconfdir = "@e_sysconfdir@"
 datarulesdir = "@e_datarulesdir@"
-localstatedir = "@e_localstatedir@"
+localstatedir = "@e_pkgstatedir@"