Re: Why does make run git?

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

Paul Eggert wrote:
> This is a typo regardless of whether my recently-proposed patch is accepted, and 
> I fixed it with the attached.

No further comment after the fix, and as the fix means that the proposed patch 
seems to be the right thing to do I installed it, along with a followup cleanup 
patch. Both patches are attached.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Default-autogen.sh-to-all.patch --]
[-- Type: text/x-patch; name="0001-Default-autogen.sh-to-all.patch", Size: 1658 bytes --]

From 7518b6a88d1da01066aa2fc7fb59b9308dc4d7e4 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Aug 2017 08:56:52 -0700
Subject: [PATCH 1/2] Default autogen.sh to 'all'

This addresses a problem noted by RMS in:
http://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00052.html
* autogen.sh (do_git): Set to true if this script is invoked
with no arguments and there is a .git subdirectory.
---
 CONTRIBUTE   | 2 +-
 INSTALL.REPO | 2 +-
 autogen.sh   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 365e423..9b5fb09 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -14,7 +14,7 @@ Briefly, the following shell commands build and run Emacs from scratch:
 	git config --global transfer.fsckObjects true
 	git clone git://git.sv.gnu.org/emacs.git
 	cd emacs
-	./autogen.sh all
+	./autogen.sh
 	./configure
 	make
 	src/emacs
diff --git a/INSTALL.REPO b/INSTALL.REPO
index ce346bb..e7bb3bb 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -19,7 +19,7 @@ To use the autotools, run the following shell command to generate the
 'configure' script and some related files, and to set up your git
 configuration:
 
-  $ ./autogen.sh all
+  $ ./autogen.sh
 
 You can then configure your build as follows:
 
diff --git a/autogen.sh b/autogen.sh
index 76fde9e..70f9cbd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -127,7 +127,8 @@ do_git=
 
 case $do_autoconf,$do_git in
   false,false)
-    do_autoconf=true;;
+    do_autoconf=true
+    test -e .git && do_git=true;;
 esac
 
 # Generate Autoconf-related files, if requested.
-- 
2.7.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Simplify-re-and-document-autoconf.sh-all.patch --]
[-- Type: text/x-patch; name="0002-Simplify-re-and-document-autoconf.sh-all.patch", Size: 1840 bytes --]

From 4c8996ded106007dee26508d23769933fc59a375 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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