From: Simon Josefsson Date: Fri, 3 May 2024 06:44:03 +0000 (+0200) Subject: maint.mk: Don't fail on ~/.indent.pro, reported by Collin Funk. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=bb5772c86a98ef1d60caf443bb230482701e1352;p=gnulib.git maint.mk: Don't fail on ~/.indent.pro, reported by Collin Funk. * top/maint.mk (indent_args): Use --ignore-profile. --- diff --git a/ChangeLog b/ChangeLog index 89e709c323..b425b2e0c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-05-03 Simon Josefsson + + maint.mk: Don't fail on ~/.indent.pro, reported by Collin Funk. + * top/maint.mk (indent_args): Use --ignore-profile. + 2024-05-01 Bruno Haible stddef: A better workaround against GCC bug 114870. diff --git a/top/maint.mk b/top/maint.mk index edcf3c7049..10b13d17a3 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -2,7 +2,7 @@ # This Makefile fragment tries to be general-purpose enough to be # used by many projects via the gnulib maintainer-makefile module. -## Copyright (C) 2001-2023 Free Software Foundation, Inc. +## Copyright (C) 2001-2024 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -1660,7 +1660,7 @@ refresh-po: # Indentation -indent_args ?= -ppi 1 +indent_args ?= --ignore-profile --preprocessor-indentation 1 C_SOURCES ?= $$($(VC_LIST_EXCEPT) | grep '\.[ch]\(.in\)\?$$') INDENT_SOURCES ?= $(C_SOURCES) exclude_file_name_regexp--indent ?= $(exclude_file_name_regexp--sc_indent)