]> 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)
committerSimon Josefsson <simon@josefsson.org>
Mon, 31 Oct 2022 08:42:42 +0000 (09:42 +0100)
* top/maint.mk (sc_indent): Don't use non-GNU indent.

ChangeLog
top/maint.mk

index 634aa8797fd3bc598745d49301dba7697fce1cae..acbe62a99671f5c2cca44c5f0a631cc9152c9747 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-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        thread: pacify gcc -Wbad-function-cast
index 495a0a2bf647b1cbd1c468e8771abb4d25574ba5..045609c285d0f9077fae2185bc7da46a1b4cb812 100644 (file)
@@ -1659,8 +1659,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                                          \