aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile7
-rw-r--r--README3
2 files changed, 4 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 98d31f4afcb..304a7b34f38 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -62,13 +62,10 @@ default $(ORDINARY_GOALS): Makefile
62# Execute in sequence, so that multiple user goals don't conflict. 62# Execute in sequence, so that multiple user goals don't conflict.
63.NOTPARALLEL: 63.NOTPARALLEL:
64 64
65# 'all' if a .git subdirectory is present, empty otherwise.
66ALL_IF_GIT = $(subst .git,all,$(wildcard .git))
67
68configure: 65configure:
69 @echo >&2 'There seems to be no "configure" file in this directory.' 66 @echo >&2 'There seems to be no "configure" file in this directory.'
70 @echo >&2 Running ./autogen.sh $(ALL_IF_GIT) ... 67 @echo >&2 Running ./autogen.sh ...
71 ./autogen.sh $(ALL_IF_GIT) 68 ./autogen.sh
72 @echo >&2 '"configure" file built.' 69 @echo >&2 '"configure" file built.'
73 70
74Makefile: configure 71Makefile: configure
diff --git a/README b/README
index 494ee08c2b7..527e406a639 100644
--- a/README
+++ b/README
@@ -45,7 +45,8 @@ The file 'configure.ac' is the input used by the autoconf program to
45construct the 'configure' script. 45construct the 'configure' script.
46 46
47The shell script 'autogen.sh' generates 'configure' and other files by 47The shell script 'autogen.sh' generates 'configure' and other files by
48running Autoconf, which in turn uses GNU m4. If you want to use it, 48running Autoconf (which in turn uses GNU m4), and configures files in
49the .git subdirectory if you are using Git. If you want to use it,
49you will need to install recent versions of these build tools. This 50you will need to install recent versions of these build tools. This
50should be needed only if you edit files like 'configure.ac' that 51should be needed only if you edit files like 'configure.ac' that
51specify Emacs's autobuild procedure. 52specify Emacs's autobuild procedure.