From 979132f019ed424afe5f73657917e15b2e7f48c3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 2 Aug 2025 09:27:33 +0200 Subject: [PATCH] am replace stray $(PERL) with @PERL@ --- Makefile.am | 2 +- src/Makefile.am | 8 ++++---- tests/Makefile.am | 4 ++-- tests/certs/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 515fa3c8b4..08af6cd028 100644 --- a/Makefile.am +++ b/Makefile.am @@ -172,7 +172,7 @@ rpms: $(MAKE) RPMDIST=curl-ssl rpm rpm: - RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \ + RPM_TOPDIR=`rpm --showrc | @PERL@ -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \ cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \ cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \ rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \ diff --git a/src/Makefile.am b/src/Makefile.am index 14202cf945..a25e84490b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -152,9 +152,9 @@ $(HUGE): $(ASCIIPAGE) $(MKHELP) echo '/* !checksrc! disable LONGLINE all */' >> $(HUGE); \ echo '#include "tool_setup.h"' >> $(HUGE); \ echo '#ifndef HAVE_LIBZ' >> $(HUGE); \ - $(PERL) $(MKHELP) < $(ASCIIPAGE) >> $(HUGE); \ + @PERL@ $(MKHELP) < $(ASCIIPAGE) >> $(HUGE); \ echo '#else' >> $(HUGE); \ - $(PERL) $(MKHELP) -c < $(ASCIIPAGE) >> $(HUGE); \ + @PERL@ $(MKHELP) -c < $(ASCIIPAGE) >> $(HUGE); \ echo '#endif /* HAVE_LIBZ */' >> $(HUGE) ) else # HAVE_LIBZ # This generates the tool_hugehelp.c file uncompressed only @@ -162,7 +162,7 @@ $(HUGE): $(ASCIIPAGE) $(MKHELP) $(HUGECMD)( \ echo '/* !checksrc! disable COPYRIGHT all */' > $(HUGE); \ echo '#include "tool_setup.h"' >> $(HUGE); \ - $(PERL) $(MKHELP) < $(ASCIIPAGE) >> $(HUGE) ) + @PERL@ $(MKHELP) < $(ASCIIPAGE) >> $(HUGE) ) endif else # PERL $(HUGE): @@ -196,7 +196,7 @@ if CURL_CA_EMBED_SET curl_CPPFLAGS += -DCURL_CA_EMBED MK_FILE_EMBED = $(top_srcdir)/src/mk-file-embed.pl $(CA_EMBED_CSOURCE): $(MK_FILE_EMBED) $(CURL_CA_EMBED) - $(PERL) $(MK_FILE_EMBED) --var curl_ca_embed < $(CURL_CA_EMBED) > $(CA_EMBED_CSOURCE) + @PERL@ $(MK_FILE_EMBED) --var curl_ca_embed < $(CURL_CA_EMBED) > $(CA_EMBED_CSOURCE) else $(CA_EMBED_CSOURCE): echo '/* !checksrc! disable COPYRIGHT all */' > $(CA_EMBED_CSOURCE) diff --git a/tests/Makefile.am b/tests/Makefile.am index d03a95cebe..91102004d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -117,7 +117,7 @@ else TEST_COMMON += !documentation endif -TEST = srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl $(TEST_COMMON) +TEST = srcdir=$(srcdir) @PERL@ $(PERLFLAGS) $(srcdir)/runtests.pl $(TEST_COMMON) TEST_Q = -a -s TEST_AM = -a -am TEST_F = -a -p -r @@ -136,7 +136,7 @@ endif # make sure that PERL is pointing to an executable perlcheck: - @if ! test -x "$(PERL)"; then echo "No perl!"; exit 2; fi + @if ! test -x "@PERL@"; then echo "No perl!"; exit 2; fi build-certs: perlcheck (cd certs && $(MAKE)) diff --git a/tests/certs/Makefile.am b/tests/certs/Makefile.am index c9e1e38c3d..d28b1674da 100644 --- a/tests/certs/Makefile.am +++ b/tests/certs/Makefile.am @@ -38,7 +38,7 @@ all-am: test-ca.cacert # Generate all certs in a single shot, but declare just a single target file # to support GNU Make <4.3 without the "grouped explicit targets" feature. test-ca.cacert: $(CERTCONFIG_CA) $(CERTCONFIGS) genserv.pl - $(PERL) $(srcdir)/genserv.pl test $(CERTCONFIGS) + @PERL@ $(srcdir)/genserv.pl test $(CERTCONFIGS) clean-local: rm -f $(GENERATEDCERTS) \