]> Savannah Git Hosting - gnulib.git/commitdiff
maintainer-makefile: Fix Apple Xcode 'make syntax-check'.
authorSimon Josefsson <simon@josefsson.org>
Mon, 31 Oct 2022 08:42:42 +0000 (09:42 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 1 Jan 2023 09:15:31 +0000 (10:15 +0100)
* top/maint.mk (sc_indent): Don't use non-GNU indent.

ChangeLog
top/maint.mk

index ad3a20cf0123d0918d6a0ff32719e40834ad2ecd..9d58592ffe8a1c0e2178ca3c7c2f1eb5454cd7cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-31  Simon Josefsson  <simon@josefsson.org>
+
+       maintainer-makefile: Fix Apple Xcode 'make syntax-check'.
+       * top/maint.mk (sc_indent): Don't use non-GNU indent.
+
 2022-10-16  Bruno Haible  <bruno@clisp.org>
 
        getdelim: Work around buggy implementation on macOS 10.13.
index 9696c87bad73f3eb2e85775a8657de503976937b..c121e37a3dde742c6a1c031b5bf58374564b797c 100644 (file)
@@ -1644,8 +1644,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                                          \