collectd: correct incorrect $< usage

Don't use $< (implied source) in non-suffix rules, use $> instead.
https://github.com/collectd/collectd/issues/3313

diff --git a/collectd/distinfo b/collectd/distinfo
index 50b0f29b93f23bdfd9676d0f585950470247e56c..1d5fccc632c4edee6199dbff18bf42c5ebf916b9 100644 (file)
--- a/collectd/distinfo
+++ b/collectd/distinfo
@@ -4,7 +4,7 @@ SHA1 (collectd-5.8.0.tar.bz2) = eb3567563de471e1950b7388e8883b911be3756a
 RMD160 (collectd-5.8.0.tar.bz2) = 7b812b1046d57a9047213bb182b8744d98606547
 SHA512 (collectd-5.8.0.tar.bz2) = 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 Size (collectd-5.8.0.tar.bz2) = 1686017 bytes
-SHA1 (patch-Makefile.am) = 0fb4b20d995cd63943b8a826cc166db1b4f36132
+SHA1 (patch-Makefile.am) = 110cce600c66226bb02291349e76433555418edd
 SHA1 (patch-configure.ac) = a98505a285635e54810597604c610541f4cdb5e3
 SHA1 (patch-src_bind.c) = 4aa7742c8e24ee6bd7293abc56fc95a605d0a2c7
 SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f

diff --git a/collectd/patches/patch-Makefile.am b/collectd/patches/patch-Makefile.am
index b3ad78a069ee98f72a18620f2c37519e82695d93..d2a2f20c77b67d36e47a16ed35e8623c18971c37 100644 (file)
--- a/collectd/patches/patch-Makefile.am
+++ b/collectd/patches/patch-Makefile.am
@@ -1,10 +1,11 @@
 $NetBSD: patch-Makefile.am,v 1.3 2018/01/04 15:42:42 jperkin Exp $
 
-Use other data directory.
+Use other data directory, correct $< in explicit rule
+(https://github.com/collectd/collectd/issues/3313).
 
---- Makefile.am.orig   2017-11-18 09:03:27.326751649 +0000
-+++ Makefile.am
-@@ -165,7 +165,7 @@ AM_CPPFLAGS = \
+--- Makefile.am.orig   2017-11-18 10:03:27.000000000 +0100
++++ Makefile.am        2019-10-08 16:53:17.694282904 +0200
+@@ -165,7 +165,7 @@
        -DPREFIX='"${prefix}"' \
        -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
        -DLOCALSTATEDIR='"${localstatedir}"' \
@@ -13,7 +14,7 @@ Use other data directory.
        -DPLUGINDIR='"${pkglibdir}"' \
        -DPKGDATADIR='"${pkgdatadir}"'
  
-@@ -1205,6 +1205,12 @@ netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+@@ -1205,6 +1205,12 @@
  netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
  endif
  
@@ -26,7 +27,7 @@ Use other data directory.
  if BUILD_PLUGIN_NETWORK
  pkglib_LTLIBRARIES += network.la
  network_la_SOURCES = \
-@@ -1942,6 +1948,8 @@ endif
+@@ -1942,6 +1948,8 @@
  if BUILD_PLUGIN_WRITE_PROMETHEUS
  BUILT_SOURCES += prometheus.pb-c.c prometheus.pb-c.h
  
@@ -35,7 +36,22 @@ Use other data directory.
  prometheus.pb-c.c prometheus.pb-c.h: $(srcdir)/proto/prometheus.proto
        $(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir)/proto --c_out=$(builddir) $(srcdir)/proto/prometheus.proto
  endif
-@@ -1964,7 +1972,7 @@ endif
+@@ -1952,19 +1960,19 @@
+ 
+ collectd.grpc.pb.cc: $(srcdir)/proto/collectd.proto $(srcdir)/proto/types.proto
+       $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto \
+-              --grpc_out=$(builddir) --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN) $<
++              --grpc_out=$(builddir) --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN) $>
+ 
+ collectd.pb.cc: $(srcdir)/proto/collectd.proto $(srcdir)/proto/types.proto
+-      $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto --cpp_out=$(builddir) $<
++      $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto --cpp_out=$(builddir) $>
+ 
+ types.pb.cc: $(srcdir)/proto/types.proto
+-      $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto --cpp_out=$(builddir) $<
++      $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto --cpp_out=$(builddir) $>
+ endif
+ endif
  
  install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run