build: use pkglibdir instead of pkglibexecdir for automake

This fixes the following problem while running `autoreconf -fi`

`pkglibexecdir' is not a legitimate directory for `LTLIBRARIES'
variable `ulogd_filter_PRINTPKT_la_SOURCES' is defined but no program or
library has `ulogd_filter_PRINTPKT_la' as canonical name (possible typo)

Signed-off-by: Björn Lässig <laessig@bitformer.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/Makefile.am b/Makefile.am
index 35e033835771edd604bdeedb63bef3bdc6acd477..bac839a41b3a6b5afd30d4595c998970c4e4c26f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = include libipulog src input filter output
 noinst_DATA = ulogd.conf
 
 edit = sed \
-       -e 's,@pkglibexecdir\@,${pkglibexecdir},g'
+       -e 's,@pkglibdir\@,${pkglibdir},g'
 
 ulogd.conf: Makefile $(srcdir)/ulogd.conf.in
        $(edit) $(srcdir)/ulogd.conf.in >ulogd.conf

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 05f1247377a491c43fe298fc5bba761f002f074d..5af069615bec7e0b101680360b2d4db234554912 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = raw2packet packet2flow
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS}
 
-pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
+pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
                         ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
                         ulogd_filter_IP2STR.la ulogd_filter_IP2BIN.la \
                         ulogd_filter_HWHDR.la ulogd_filter_MARK.la \

diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index a39f3aeeaeabe2c7481df73a0e2565930fb8c25d..7498f9aa3c552a8b62c31b836d72fde229466e7c 100644 (file)
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglibexec_LTLIBRARIES = ulogd_raw2packet_BASE.la 
+pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la
 
 ulogd_raw2packet_BASE_la_SOURCES = ulogd_raw2packet_BASE.c
 ulogd_raw2packet_BASE_la_LDFLAGS = -avoid-version -module

diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index eaa16441814be3984342e76dc7d6d055bf953dc1..127caf6ba2e1b281609bfae823ce0c82ba04b17a 100644 (file)
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglibexec_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
+pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 
 ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
 ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index d4ca449492998febd977fae335dfabe740d3f18f..250543b1910f979883c3525c3b3486fdf53295e7 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglibexec_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \
+pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \
                         ulogd_inppkt_UNIXSOCK.la
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c

diff --git a/input/sum/Makefile.am b/input/sum/Makefile.am
index 04051b4501f3d4f3d83ff73ebda08669a11947d6..f1291932e18f6bc616ca5f986e43e9ced120bfc0 100644 (file)
--- a/input/sum/Makefile.am
+++ b/input/sum/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglibexec_LTLIBRARIES = ulogd_inpflow_NFACCT.la
+pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la
 
 ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c
 ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS)

diff --git a/output/Makefile.am b/output/Makefile.am
index bb93b28f56ced8f3a8f7b0d3bd68fe5961f9ffa3..db05d0b951adaf0c2d18739c18c17ed46c22034b 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi
 
-pkglibexec_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
+pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
                         ulogd_output_OPRINT.la ulogd_output_GPRINT.la \
                         ulogd_output_NACCT.la ulogd_output_XML.la
 

diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index ca05e00b249df8fc562395c9e517c45414c09cf2..f413cab4a3405398d8386f5f895bc004bc05d8c6 100644 (file)
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_DBI
 
-pkglibexec_LTLIBRARIES = ulogd_output_DBI.la
+pkglib_LTLIBRARIES = ulogd_output_DBI.la
 
 ulogd_output_DBI_la_SOURCES = ulogd_output_DBI.c ../../util/db.c
 ulogd_output_DBI_la_LIBADD  = ${DBI_LIB}

diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 5c3afbb6ccab2aa014c131cfd5aba301ebffae18..c24208c3e3026ae96e75226c02a2ad1cfe014866 100644 (file)
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_MYSQL
 
-pkglibexec_LTLIBRARIES = ulogd_output_MYSQL.la
+pkglib_LTLIBRARIES = ulogd_output_MYSQL.la
 
 ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c
 ulogd_output_MYSQL_la_LIBADD  = ${MYSQL_LIB}

diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index 54c6da3906bc68d886b4d5972081d2676bc68c09..47580d2d899ced74ef7f0ffb5a091c39a3886035 100644 (file)
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_PCAP
 
-pkglibexec_LTLIBRARIES = ulogd_output_PCAP.la
+pkglib_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
 ulogd_output_PCAP_la_LIBADD  = ${PCAP_LIB}

diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 32b3ea2392472ab30e0036740afe4403dda5b12a..bdaf1d249dce04f2e16919b9170e79cc556b60dc 100644 (file)
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_PGSQL
 
-pkglibexec_LTLIBRARIES = ulogd_output_PGSQL.la
+pkglib_LTLIBRARIES = ulogd_output_PGSQL.la
 
 ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c
 ulogd_output_PGSQL_la_LIBADD  = ${PQLIBS}

diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index d1377b6c8e6a26812c3d9a8d30ee3fd9328df5ee..dd148ec4e5dd9d0c39f037f5ea2920d3e9ffca2f 100644 (file)
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS} ${libsqlite3_CFLAGS}
 
 if HAVE_SQLITE3
 
-pkglibexec_LTLIBRARIES = ulogd_output_SQLITE3.la
+pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la
 
 ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c
 ulogd_output_SQLITE3_la_LIBADD  = ${libsqlite3_LIBS}

diff --git a/ulogd.conf.in b/ulogd.conf.in
index cf6987b25f76091c1f44c253a18a6b1d62e4209e..e3d40226eb7d0bc46ccf5d7c00f088ae1de84d60 100644 (file)
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -25,30 +25,30 @@ loglevel=1
 # 2. options for each plugin in seperate section below
 
 
-plugin="@pkglibexecdir@/ulogd_inppkt_NFLOG.so"
-#plugin="@pkglibexecdir@/ulogd_inppkt_ULOG.so"
-#plugin="@pkglibexecdir@/ulogd_inppkt_UNIXSOCK.so"
-plugin="@pkglibexecdir@/ulogd_inpflow_NFCT.so"
-plugin="@pkglibexecdir@/ulogd_filter_IFINDEX.so"
-plugin="@pkglibexecdir@/ulogd_filter_IP2STR.so"
-plugin="@pkglibexecdir@/ulogd_filter_IP2BIN.so"
-#plugin="@pkglibexecdir@/ulogd_filter_IP2HBIN.so"
-plugin="@pkglibexecdir@/ulogd_filter_PRINTPKT.so"
-plugin="@pkglibexecdir@/ulogd_filter_HWHDR.so"
-plugin="@pkglibexecdir@/ulogd_filter_PRINTFLOW.so"
-#plugin="@pkglibexecdir@/ulogd_filter_MARK.so"
-plugin="@pkglibexecdir@/ulogd_output_LOGEMU.so"
-plugin="@pkglibexecdir@/ulogd_output_SYSLOG.so"
-plugin="@pkglibexecdir@/ulogd_output_XML.so"
-#plugin="@pkglibexecdir@/ulogd_output_SQLITE3.so"
-plugin="@pkglibexecdir@/ulogd_output_GPRINT.so"
-#plugin="@pkglibexecdir@/ulogd_output_NACCT.so"
-#plugin="@pkglibexecdir@/ulogd_output_PCAP.so"
-#plugin="@pkglibexecdir@/ulogd_output_PGSQL.so"
-#plugin="@pkglibexecdir@/ulogd_output_MYSQL.so"
-#plugin="@pkglibexecdir@/ulogd_output_DBI.so"
-plugin="@pkglibexecdir@/ulogd_raw2packet_BASE.so"
-plugin="@pkglibexecdir@/ulogd_inpflow_NFACCT.so"
+plugin="@pkglibdir@/ulogd_inppkt_NFLOG.so"
+#plugin="@pkglibdir@/ulogd_inppkt_ULOG.so"
+#plugin="@pkglibdir@/ulogd_inppkt_UNIXSOCK.so"
+plugin="@pkglibdir@/ulogd_inpflow_NFCT.so"
+plugin="@pkglibdir@/ulogd_filter_IFINDEX.so"
+plugin="@pkglibdir@/ulogd_filter_IP2STR.so"
+plugin="@pkglibdir@/ulogd_filter_IP2BIN.so"
+#plugin="@pkglibdir@/ulogd_filter_IP2HBIN.so"
+plugin="@pkglibdir@/ulogd_filter_PRINTPKT.so"
+plugin="@pkglibdir@/ulogd_filter_HWHDR.so"
+plugin="@pkglibdir@/ulogd_filter_PRINTFLOW.so"
+#plugin="@pkglibdir@/ulogd_filter_MARK.so"
+plugin="@pkglibdir@/ulogd_output_LOGEMU.so"
+plugin="@pkglibdir@/ulogd_output_SYSLOG.so"
+plugin="@pkglibdir@/ulogd_output_XML.so"
+#plugin="@pkglibdir@/ulogd_output_SQLITE3.so"
+plugin="@pkglibdir@/ulogd_output_GPRINT.so"
+#plugin="@pkglibdir@/ulogd_output_NACCT.so"
+#plugin="@pkglibdir@/ulogd_output_PCAP.so"
+#plugin="@pkglibdir@/ulogd_output_PGSQL.so"
+#plugin="@pkglibdir@/ulogd_output_MYSQL.so"
+#plugin="@pkglibdir@/ulogd_output_DBI.so"
+plugin="@pkglibdir@/ulogd_raw2packet_BASE.so"
+plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so"
 
 # this is a stack for logging packet send by system via LOGEMU
 #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU