From 2e5c9fc82d6d8b601ce1332666d66f66144212b9 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Mon, 31 Oct 2022 09:42:42 +0100 Subject: [PATCH] maintainer-makefile: Fix Apple Xcode 'make syntax-check'. * top/maint.mk (sc_indent): Don't use non-GNU indent. --- ChangeLog | 5 +++++ top/maint.mk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f19633951..cfbc3d7963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-10-31 Simon Josefsson + + maintainer-makefile: Fix Apple Xcode 'make syntax-check'. + * top/maint.mk (sc_indent): Don't use non-GNU indent. + 2022-10-16 Bruno Haible getdelim: Work around buggy implementation on macOS 10.13. diff --git a/top/maint.mk b/top/maint.mk index c1fdf9ca2c..94babfd2eb 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1653,8 +1653,8 @@ indent: # Running indent once is not idempotent, but running it twice is. indent $(indent_args) $(INDENT_SOURCES) sc_indent: - @if ! command -v indent > /dev/null; then \ - echo 1>&2 '$(ME): sc_indent: indent is missing'; \ + @if ! indent --version 2> /dev/null | grep -q 'GNU indent'; then\ + echo 1>&2 '$(ME): sc_indent: GNU indent is missing'; \ else \ fail=0; files="$(INDENT_SOURCES)"; \ for f in $$files; do \ -- 2.39.5