bootstrap: honor m4_base when running aclocal

[pspp] / Makefile

diff --git a/Makefile b/Makefile
index 745c603c70e3946ef61fd21d1847ab08a9d8eb93..9c0d0c3bf44be29bcc62b55381ab42c873e5198a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,16 @@ sc_pragma_columns:
                 exit 1; } || :;                                        \
        else :; fi
 
+# Verify that certain (for now, only Jim Meyering and Eric Blake's)
+# *.c files are consistently cpp indented.
+sc_cpp_indent_check:
+       ./gnulib-tool --extract-filelist \
+            $$(cd ./modules; grep -ilrE '(meyering|blake)' .) \
+          | sort -u \
+          | grep '\.c$$' \
+          | grep -v '/getloadavg\.c$$' \
+          | xargs cppi -c
+
 # Regenerate some files that are stored in the repository.
 regen: MODULES.html
 
@@ -60,6 +70,7 @@ MODULES.html: MODULES.html.sh
 # as well as those in tests/unictype (generated).
 # Also exclude any file that includes the "GENERATED AUTOMATICALLY" comment,
 # being careful not to exclude code that merely generates the comment.
+# Also exclude doc/INSTALL*, since they too are generated.
 update-copyright:
        exempt=$$(mktemp);                                              \
        grep -v '^#' config/srclist.txt|grep -v '^$$'                   \
@@ -69,6 +80,7 @@ update-copyright:
              echo "$$dst"/$$(basename "$$src");                        \
            done > $$exempt;                                            \
        git ls-files tests/unictype >> $$exempt;                        \
+       git ls-files doc/INSTALL* >> $$exempt;                          \
        git ls-files | grep -vFf $$exempt                               \
          | xargs grep -L '^/\*.*GENERATED AUTOMATICALLY'               \
          | UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79                         \