From 84912d4b24382ae022da3a863bd6caa2b8948d94 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Thu, 25 Feb 2021 18:16:07 -0500 Subject: build: Remove spaces from variable-printing rules This simplifies parsing when using these rules from scripts. --- Makefile.am | 2 +- contrib/guix/guix-build | 2 +- depends/Makefile | 2 +- src/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index be62c3e6a9..5e453b9ae1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ # Pattern rule to print variables, e.g. make print-top_srcdir print-%: - @echo '$*' = '$($*)' + @echo '$*'='$($*)' ACLOCAL_AMFLAGS = -I build-aux/m4 SUBDIRS = src diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index d817fb74ba..818ea7c8ef 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -119,7 +119,7 @@ fi for host in $HOSTS; do case "$host" in *darwin*) - OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=[[:space:]]\+@@g')" + OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g')" if [ -e "$OSX_SDK" ]; then echo "Found macOS SDK at '${OSX_SDK}', using..." else diff --git a/depends/Makefile b/depends/Makefile index dadb21515a..c5dfd1e8a7 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -2,7 +2,7 @@ # Pattern rule to print variables, e.g. make print-top_srcdir print-%: - @echo '$*' = '$($*)' + @echo '$*'='$($*)' # When invoking a sub-make, keep only the command line variable definitions # matching the pattern in the filter function. diff --git a/src/Makefile.am b/src/Makefile.am index 4e09c86ebd..b47bdfaa26 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ # Pattern rule to print variables, e.g. make print-top_srcdir print-%: - @echo '$*' = '$($*)' + @echo '$*'='$($*)' DIST_SUBDIRS = secp256k1 univalue -- cgit v1.2.3