bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] maintainer-makefile: Fix Apple Xcode 'make syntax-check'.


From: Simon Josefsson
Subject: [PATCH] maintainer-makefile: Fix Apple Xcode 'make syntax-check'.
Date: Mon, 31 Oct 2022 20:18:36 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)

Hi.  I installed this to let 'make syntax-check' on Mac OS succeed, I
don't think it is useful to use non-GNU indent.

/Simon
From 4ad0eedf4ff8d294a10c20b8945d0e59aa8141db Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
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 634aa8797f..acbe62a996 100644
--- 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
diff --git a/top/maint.mk b/top/maint.mk
index 495a0a2bf6..045609c285 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -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                                          \
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]