Re: [update] collectd 5.12
Le Sat, Oct 22, 2022 at 09:08:56AM +0200, Landry Breuil a écrit :
> Le Fri, Oct 21, 2022 at 11:44:27PM +0200, Solène Rapenne a écrit :
> > Le Thu, 20 Oct 2022 16:27:20 +0200,
> > Landry Breuil a écrit :
> >
> > > Hi,
> > >
> > > here's an update to collectd 5.12, cf
> > > https://github.com/collectd/collectd/blob/main/ChangeLog for changelog.
> > >
> > > apparently upstream went on a v6 branch to break the ABI
> > > (https://github.com/orgs/collectd/projects/1) but not
> > > everyone is liking it, cf
> > > https://github.com/collectd/collectd/issues/4048 - so the v5 branch isnt
> > > maintained that much, but we're still lagging behind many releases
> > > anyway :)
> > >
> > > builds fine, totally untested. Feedback welcome !
> > >
> > > Landry
> >
> > as I made a change meanwhile, I'm joining the update diff for the bump
>
> yeah, seen that, manually merged... its fun to have conflicts on a port
> nobody bothered for years :)
> >
> > However with this new version, it fails to start
> >
> > Oct 21 23:42:07 t400 collectd[26742]: fopen (/var/collectd.pid): Permission
> > denied
>
> seen it too, should be fixed by patches/patch-src_daemon_collectd_h in
> the below diff (or define PIDFile in your configfile maybe
> patch-src_collectd_conf_in should be changed so that lines are
> uncommented)
Bah, previous diff was wrong, i just needed to reinstate a chunk from
patches/patch-Makefile_in to properly define PIDFILE during build.
Below diff actually tested & working here without PIDFile defined in
config, pidfile properly ends up in /var/collectd :)
Landry
? build.log
? patches/patch-src_daemon_collectd_h
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- Makefile21 Oct 2022 15:32:04 - 1.72
+++ Makefile22 Oct 2022 07:29:22 -
@@ -13,7 +13,7 @@
COMMENT-prometheus = collectd prometheus plugin
COMMENT-ping = collectd ping plugin
-V =5.8.1
+V =5.12.0
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql =collectd-mysql-$V
@@ -30,20 +30,6 @@
PKGNAME-prometheus = collectd-prometheus-$V
PKGNAME-ping = collectd-ping-$V
CATEGORIES = sysutils
-REVISION-main =2
-REVISION-memcachec = 2
-REVISION-mqtt =1
-REVISION-mysql = 2
-REVISION-nut = 3
-REVISION-pgsql = 1
-REVISION-ping =1
-REVISION-prometheus = 4
-REVISION-python = 3
-REVISION-redis = 1
-REVISION-riemann = 4
-REVISION-rrdtool = 4
-REVISION-snmp =1
-REVISION-virt =4
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -78,7 +64,7 @@
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-snmp = net/net-snmp
-WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl
+WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl ssl
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-virt = sysutils/libvirt
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo18 Nov 2018 19:39:29 - 1.12
+++ distinfo22 Oct 2022 07:29:22 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.8.1.tar.bz2) = 55b9onzgY3f0ka2RqihpYqaMK1QHaqd6KWc9UyBEU9o=
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.12.0.tar.bz2) = W64EMELBnDH3frhGTlagGlRU4LOfoHz3rQ8b/Jw6CdY=
+SIZE (collectd-5.12.0.tar.bz2) = 1902756
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:57:17 - 1.11
+++ patches/patch-Makefile_in 22 Oct 2022 07:29:22 -
@@ -1,26 +1,26 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -109,7 +109,7 @@ check_PROGRAMS = test_common$(EXEEXT) test_format_grap
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
- @BUILD_WITH_LIBKSTAT_TRUE@am__append_5 = -lkstat
- @BUILD_WITH_LIBDEVINFO_TRUE@am__append_6 = -ldevinfo
--@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
-+@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
+@@ -129,7 +129,7 @@ TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) $(am__EXEEXT
+ @BUILD_WIN32_TRUE@am__append_13 = -ldl -Wl,--out-implib,libcollectd.a \
+ @BUILD_WIN32_TRUE@-Wl,--out-implib,libcollectd.a
+ @BUILD_WIN32_FALSE@am__append_14 = src/daemon/cmd.c
+-@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
Re: [update] collectd 5.12
Le Fri, Oct 21, 2022 at 11:44:27PM +0200, Solène Rapenne a écrit :
> Le Thu, 20 Oct 2022 16:27:20 +0200,
> Landry Breuil a écrit :
>
> > Hi,
> >
> > here's an update to collectd 5.12, cf
> > https://github.com/collectd/collectd/blob/main/ChangeLog for changelog.
> >
> > apparently upstream went on a v6 branch to break the ABI
> > (https://github.com/orgs/collectd/projects/1) but not
> > everyone is liking it, cf
> > https://github.com/collectd/collectd/issues/4048 - so the v5 branch isnt
> > maintained that much, but we're still lagging behind many releases
> > anyway :)
> >
> > builds fine, totally untested. Feedback welcome !
> >
> > Landry
>
> as I made a change meanwhile, I'm joining the update diff for the bump
yeah, seen that, manually merged... its fun to have conflicts on a port
nobody bothered for years :)
>
> However with this new version, it fails to start
>
> Oct 21 23:42:07 t400 collectd[26742]: fopen (/var/collectd.pid): Permission
> denied
seen it too, should be fixed by patches/patch-src_daemon_collectd_h in
the below diff (or define PIDFile in your configfile maybe
patch-src_collectd_conf_in should be changed so that lines are
uncommented)
afaict, works for me when sending everything to influxdb.
Landry
? build.log
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- Makefile21 Oct 2022 15:32:04 - 1.72
+++ Makefile22 Oct 2022 07:02:13 -
@@ -13,7 +13,7 @@
COMMENT-prometheus = collectd prometheus plugin
COMMENT-ping = collectd ping plugin
-V =5.8.1
+V =5.12.0
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql =collectd-mysql-$V
@@ -30,20 +30,6 @@
PKGNAME-prometheus = collectd-prometheus-$V
PKGNAME-ping = collectd-ping-$V
CATEGORIES = sysutils
-REVISION-main =2
-REVISION-memcachec = 2
-REVISION-mqtt =1
-REVISION-mysql = 2
-REVISION-nut = 3
-REVISION-pgsql = 1
-REVISION-ping =1
-REVISION-prometheus = 4
-REVISION-python = 3
-REVISION-redis = 1
-REVISION-riemann = 4
-REVISION-rrdtool = 4
-REVISION-snmp =1
-REVISION-virt =4
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -78,7 +64,7 @@
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-snmp = net/net-snmp
-WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl
+WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl ssl
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-virt = sysutils/libvirt
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo18 Nov 2018 19:39:29 - 1.12
+++ distinfo22 Oct 2022 07:02:13 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.8.1.tar.bz2) = 55b9onzgY3f0ka2RqihpYqaMK1QHaqd6KWc9UyBEU9o=
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.12.0.tar.bz2) = W64EMELBnDH3frhGTlagGlRU4LOfoHz3rQ8b/Jw6CdY=
+SIZE (collectd-5.12.0.tar.bz2) = 1902756
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:57:17 - 1.11
+++ patches/patch-Makefile_in 22 Oct 2022 07:02:13 -
@@ -1,26 +1,26 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -109,7 +109,7 @@ check_PROGRAMS = test_common$(EXEEXT) test_format_grap
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
- @BUILD_WITH_LIBKSTAT_TRUE@am__append_5 = -lkstat
- @BUILD_WITH_LIBDEVINFO_TRUE@am__append_6 = -ldevinfo
--@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
-+@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
+@@ -129,7 +129,7 @@ TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) $(am__EXEEXT
+ @BUILD_WIN32_TRUE@am__append_13 = -ldl -Wl,--out-implib,libcollectd.a \
+ @BUILD_WIN32_TRUE@-Wl,--out-implib,libcollectd.a
+ @BUILD_WIN32_FALSE@am__append_14 = src/daemon/cmd.c
+-@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
++@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}.pid"'
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
# too. -octo
-@@ -3210,7 +3210,7 @@ AM_CPPFLAGS = \
- -DPREFIX='"${prefix}"' \
- -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-
Re: [update] collectd 5.12
Le Thu, 20 Oct 2022 16:27:20 +0200,
Landry Breuil a écrit :
> Hi,
>
> here's an update to collectd 5.12, cf
> https://github.com/collectd/collectd/blob/main/ChangeLog for changelog.
>
> apparently upstream went on a v6 branch to break the ABI
> (https://github.com/orgs/collectd/projects/1) but not
> everyone is liking it, cf
> https://github.com/collectd/collectd/issues/4048 - so the v5 branch isnt
> maintained that much, but we're still lagging behind many releases
> anyway :)
>
> builds fine, totally untested. Feedback welcome !
>
> Landry
as I made a change meanwhile, I'm joining the update diff for the bump
However with this new version, it fails to start
Oct 21 23:42:07 t400 collectd[26742]: fopen (/var/collectd.pid): Permission
denied
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile21 Oct 2022 15:32:04 - 1.72
+++ Makefile21 Oct 2022 21:41:10 -
@@ -13,7 +13,7 @@ COMMENT-redis = collectd redis plugin
COMMENT-prometheus = collectd prometheus plugin
COMMENT-ping = collectd ping plugin
-V =5.8.1
+V =5.12.0
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql =collectd-mysql-$V
@@ -30,20 +30,6 @@ PKGNAME-redis = collectd-redis-$V
PKGNAME-prometheus = collectd-prometheus-$V
PKGNAME-ping = collectd-ping-$V
CATEGORIES = sysutils
-REVISION-main =2
-REVISION-memcachec = 2
-REVISION-mqtt =1
-REVISION-mysql = 2
-REVISION-nut = 3
-REVISION-pgsql = 1
-REVISION-ping =1
-REVISION-prometheus = 4
-REVISION-python = 3
-REVISION-redis = 1
-REVISION-riemann = 4
-REVISION-rrdtool = 4
-REVISION-snmp =1
-REVISION-virt =4
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -78,7 +64,7 @@ LIB_DEPENDS-rrdtool = net/rrdtool
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-snmp = net/net-snmp
-WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl
+WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl ssl
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-virt = sysutils/libvirt
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo18 Nov 2018 19:39:29 - 1.12
+++ distinfo21 Oct 2022 21:41:10 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.8.1.tar.bz2) = 55b9onzgY3f0ka2RqihpYqaMK1QHaqd6KWc9UyBEU9o=
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.12.0.tar.bz2) = W64EMELBnDH3frhGTlagGlRU4LOfoHz3rQ8b/Jw6CdY=
+SIZE (collectd-5.12.0.tar.bz2) = 1902756
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:57:17 - 1.11
+++ patches/patch-Makefile_in 21 Oct 2022 21:41:10 -
@@ -1,26 +1,26 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -109,7 +109,7 @@ check_PROGRAMS = test_common$(EXEEXT) test_format_grap
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
- @BUILD_WITH_LIBKSTAT_TRUE@am__append_5 = -lkstat
- @BUILD_WITH_LIBDEVINFO_TRUE@am__append_6 = -ldevinfo
--@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
-+@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
+@@ -129,7 +129,7 @@ TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) $(am__EXEEXT
+ @BUILD_WIN32_TRUE@am__append_13 = -ldl -Wl,--out-implib,libcollectd.a \
+ @BUILD_WIN32_TRUE@-Wl,--out-implib,libcollectd.a
+ @BUILD_WIN32_FALSE@am__append_14 = src/daemon/cmd.c
+-@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
++@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}.pid"'
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
# too. -octo
-@@ -3210,7 +3210,7 @@ AM_CPPFLAGS = \
- -DPREFIX='"${prefix}"' \
- -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- -DLOCALSTATEDIR='"${localstatedir}"' \
-- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
-+ -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \
- -DPLUGINDIR='"${pkglibdir}"' \
- -DPKGDATADIR='"${pkgdatadir}"'
-
-@@ -7821,16 +7821,8 @@ uninstall-man: uninstall-man1 uninstall-man5
- @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@ $(V_PROTOC)$(PROTOC)
[update] collectd 5.12
Hi,
here's an update to collectd 5.12, cf
https://github.com/collectd/collectd/blob/main/ChangeLog for changelog.
apparently upstream went on a v6 branch to break the ABI
(https://github.com/orgs/collectd/projects/1) but not
everyone is liking it, cf
https://github.com/collectd/collectd/issues/4048 - so the v5 branch isnt
maintained that much, but we're still lagging behind many releases
anyway :)
builds fine, totally untested. Feedback welcome !
Landry
? build.log
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile24 May 2022 18:51:25 - 1.71
+++ Makefile20 Oct 2022 14:22:14 -
@@ -13,7 +13,7 @@
COMMENT-prometheus = collectd prometheus plugin
COMMENT-ping = collectd ping plugin
-V =5.8.1
+V =5.12.0
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql =collectd-mysql-$V
@@ -30,20 +30,6 @@
PKGNAME-prometheus = collectd-prometheus-$V
PKGNAME-ping = collectd-ping-$V
CATEGORIES = sysutils
-REVISION-main =1
-REVISION-memcachec = 1
-REVISION-mqtt =0
-REVISION-mysql = 1
-REVISION-nut = 2
-REVISION-pgsql = 0
-REVISION-ping =0
-REVISION-prometheus = 3
-REVISION-python = 2
-REVISION-redis = 0
-REVISION-riemann = 3
-REVISION-rrdtool = 3
-REVISION-snmp =0
-REVISION-virt =3
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -78,7 +64,7 @@
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-snmp = net/net-snmp
-WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl
+WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl ssl
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-virt = sysutils/libvirt
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo18 Nov 2018 19:39:29 - 1.12
+++ distinfo20 Oct 2022 14:22:14 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.8.1.tar.bz2) = 55b9onzgY3f0ka2RqihpYqaMK1QHaqd6KWc9UyBEU9o=
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.12.0.tar.bz2) = W64EMELBnDH3frhGTlagGlRU4LOfoHz3rQ8b/Jw6CdY=
+SIZE (collectd-5.12.0.tar.bz2) = 1902756
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:57:17 - 1.11
+++ patches/patch-Makefile_in 20 Oct 2022 14:22:14 -
@@ -1,26 +1,26 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -109,7 +109,7 @@ check_PROGRAMS = test_common$(EXEEXT) test_format_grap
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
- @BUILD_WITH_LIBKSTAT_TRUE@am__append_5 = -lkstat
- @BUILD_WITH_LIBDEVINFO_TRUE@am__append_6 = -ldevinfo
--@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
-+@BUILD_FEATURE_DAEMON_TRUE@am__append_7 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
+@@ -129,7 +129,7 @@ TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) $(am__EXEEXT
+ @BUILD_WIN32_TRUE@am__append_13 = -ldl -Wl,--out-implib,libcollectd.a \
+ @BUILD_WIN32_TRUE@-Wl,--out-implib,libcollectd.a
+ @BUILD_WIN32_FALSE@am__append_14 = src/daemon/cmd.c
+-@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
++@BUILD_FEATURE_DAEMON_TRUE@am__append_15 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}.pid"'
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
# too. -octo
-@@ -3210,7 +3210,7 @@ AM_CPPFLAGS = \
- -DPREFIX='"${prefix}"' \
- -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- -DLOCALSTATEDIR='"${localstatedir}"' \
-- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
-+ -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \
- -DPLUGINDIR='"${pkglibdir}"' \
- -DPKGDATADIR='"${pkgdatadir}"'
-
-@@ -7821,16 +7821,8 @@ uninstall-man: uninstall-man1 uninstall-man5
- @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@ $(V_PROTOC)$(PROTOC)
-I$(srcdir)/proto --cpp_out=$(builddir) $<
+@@ -4000,7 +4000,7 @@ AM_YFLAGS = -d
+ @BUILD_WIN32_TRUE@cpkgdatadir = $(datadir)
+ @BUILD_WIN32_FALSE@cpkglibdir = $(pkglibdir)
+ @BUILD_WIN32_TRUE@cpkglibdir = $(libdir)/plugins
+-@BUILD_WIN32_FALSE@cpkglocalstatedir = ${localstatedir}/lib/${PACKAGE_NAME}
++@BUILD_WIN32_FALSE@cpkglocalstatedir = ${localstatedir}/${PACKAGE_NAME}
+ @BUILD_WIN32_TRUE@cpkglocalstatedir = ${localstatedir}
