Fix issue with $< automatic variable on FreeBSD
authorTobias Brunner <tobias@strongswan.org>
Fri, 23 Aug 2019 07:40:59 +0000 (09:40 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 27 Aug 2019 16:12:28 +0000 (18:12 +0200)
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
src/starter/Makefile.am
src/stroke/Makefile.am

index db8e9c2..77fe6eb 100644 (file)
@@ -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
index 1dc656f..298a1fb 100644 (file)
@@ -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
index 3b7c465..2f3d5c1 100644 (file)
@@ -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