From 4c8996ded106007dee26508d23769933fc59a375 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 12 Aug 2017 09:06:55 -0700 Subject: [PATCH 2/2] Simplify re and document 'autoconf.sh all' * GNUmakefile (ALL_IF_GIT): Remove; no longer needed, now that ./autogen.sh defaults to "all". All uses removed. * README: Mention autoconf.sh's effect on Git configuration. --- GNUmakefile | 7 ++----- README | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 98d31f4..304a7b3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -62,13 +62,10 @@ default $(ORDINARY_GOALS): # Execute in sequence, so that multiple user goals don't conflict. .NOTPARALLEL: -# 'all' if a .git subdirectory is present, empty otherwise. -ALL_IF_GIT = $(subst .git,all,$(wildcard .git)) - configure: @echo >&2 'There seems to be no "configure" file in this directory.' - @echo >&2 Running ./autogen.sh $(ALL_IF_GIT) ... - ./autogen.sh $(ALL_IF_GIT) + @echo >&2 Running ./autogen.sh ... + ./autogen.sh @echo >&2 '"configure" file built.' Makefile: configure diff --git a/README b/README index 494ee08..527e406 100644 --- a/README +++ b/README @@ -45,7 +45,8 @@ The file 'configure.ac' is the input used by the autoconf program to construct the 'configure' script. The shell script 'autogen.sh' generates 'configure' and other files by -running Autoconf, which in turn uses GNU m4. If you want to use it, +running Autoconf (which in turn uses GNU m4), and configures files in +the .git subdirectory if you are using Git. If you want to use it, you will need to install recent versions of these build tools. This should be needed only if you edit files like 'configure.ac' that specify Emacs's autobuild procedure. -- 2.7.4