From c96032a57b4d61ca44ca4b599a6b50cd57a706ad Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sun, 11 Feb 2024 20:46:42 +0100
Subject: [PATCH] Move all autotools helper scripts to auto-aux/

Move all autotools helper scripts and auxiliary files installed
automatically by the autotools to auto-aux/ (e.g. config.guess,
depcomp, install-sh, texinfo.tex, etc.).

Moving AC_CANONICAL_TARGET after AC_CONFIG_AUX_DIR works
around a silent bug in Autoconf 2.69 where the generated
configure script would not find the install-sh file which
has been placed in that given aux directory.

Moved AM_INIT_AUTOMAKE which must also happen after
AC_CONFIG_AUX_DIR.
---
 src/auto-aux/.gitignore | 2 ++
 src/configure.ac        | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/auto-aux/.gitignore

diff --git a/src/auto-aux/.gitignore b/src/auto-aux/.gitignore
new file mode 100644
index 00000000..cf0fcab4
--- /dev/null
+++ b/src/auto-aux/.gitignore
@@ -0,0 +1,2 @@
+# Ensure git creates empty directory for autotools to place files into
+*
diff --git a/src/configure.ac b/src/configure.ac
index 65cd7f6d..9734c312 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -27,14 +27,16 @@ AC_INIT([avrdude],
         m4_esyscmd([./build-helpers/package-version . version-stamp]),
         [https://github.com/avrdudes/avrdude/issues])
 
+AC_CONFIG_SRCDIR([main.c])
+AC_CONFIG_HEADERS([ac_cfg.h])
+AC_CONFIG_AUX_DIR([auto-aux])
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AC_CONFIG_SRCDIR([main.c])
 AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_HEADERS(ac_cfg.h)
-AC_CONFIG_MACRO_DIR([m4])
 
 # Check that the build-helpers/package-version script has worked properly.
 case "$PACKAGE_VERSION" in