From 535277afc588a816a95fd8b2bf286343ccf235ca Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 23 Aug 2019 09:40:59 +0200 Subject: [PATCH] Fix issue with $< automatic variable on FreeBSD BSD make only evaluates $< for implicit rules, so building from the repository won't work unless GNU make is installed and used, or we replace affected uses like this. --- src/libstrongswan/Makefile.am | 4 ++-- src/starter/Makefile.am | 4 ++-- src/stroke/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index db8e9c23a..77fe6ebff 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -231,13 +231,13 @@ $(srcdir)/crypto/proposal/proposal_keywords_static.h: $(srcdir)/crypto/proposal/ $(AM_V_GEN) \ sed \ -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ - $< > $@ + $(srcdir)/crypto/proposal/proposal_keywords_static.h.in > $@ $(srcdir)/crypto/proposal/proposal_keywords_static.c: $(srcdir)/crypto/proposal/proposal_keywords_static.txt \ $(srcdir)/crypto/proposal/proposal_keywords_static.h $(AM_V_GEN) \ $(GPERF) -N proposal_get_token_static -m 10 -C -G -c -t -D \ - --output-file=$@ $< + --output-file=$@ $(srcdir)/crypto/proposal/proposal_keywords_static.txt if STATIC_PLUGIN_CONSTRUCTORS BUILT_SOURCES += $(srcdir)/plugin_constructors.c diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index 1dc656fed..298a1fb57 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -50,12 +50,12 @@ keywords.h: $(srcdir)/keywords.h.in $(AM_V_GEN) \ sed \ -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ - $< > $@ + $(srcdir)/keywords.h.in > $@ keywords.c: $(srcdir)/keywords.txt keywords.h $(AM_V_GEN) \ $(GPERF) -m 10 -C -G -D -t \ - --output-file=$@ $< + --output-file=$@ $(srcdir)/keywords.txt install-exec-local : test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true diff --git a/src/stroke/Makefile.am b/src/stroke/Makefile.am index 3b7c465b6..2f3d5c120 100644 --- a/src/stroke/Makefile.am +++ b/src/stroke/Makefile.am @@ -15,9 +15,9 @@ stroke_keywords.h: $(srcdir)/stroke_keywords.h.in $(AM_V_GEN) \ sed \ -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ - $< > $@ + $(srcdir)/stroke_keywords.h.in > $@ stroke_keywords.c: $(srcdir)/stroke_keywords.txt stroke_keywords.h $(AM_V_GEN) \ $(GPERF) -m 10 -D -C -G -t \ - --output-file=$@ $< + --output-file=$@ $(srcdir)/stroke_keywords.txt