diff options
| author | Paul Smith <psmith@gnu.org> | 2022-07-07 01:38:26 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-07-09 10:47:13 -0400 |
| commit | 73b08af181544381840d5f9bc577d686f8c7e174 (patch) | |
| tree | b421ec9e4f9eccb7d621658bb132f81db9a5fcf0 | |
| parent | 5c1d9e54c7e7e124d95f6b08505f39914e65357a (diff) | |
| download | make-git-73b08af181544381840d5f9bc577d686f8c7e174.tar.gz | |
Move our local m4 macros to gl/m4
The gl subdirectory contains our local versions of gnulib module
implementations, so move m4/acinclude.m4 and m4/dospaths.m4 there.
* gl/modules/make-macros: Create a new module to handle the macros.
* bootstrap.conf: Add the new module.
* configure.ac: Macro invocation is moved to make-macros.
* m4/.gitignore: Delete unnecessary ignore file: m4 is empty.
* .gitignore: Add m4/ as an ignored directory.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | bootstrap.conf | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gl/m4/acinclude.m4 (renamed from m4/acinclude.m4) | 0 | ||||
| -rw-r--r-- | gl/m4/dospaths.m4 (renamed from m4/dospaths.m4) | 0 | ||||
| -rw-r--r-- | gl/modules/make-macros | 16 | ||||
| -rw-r--r-- | m4/.gitignore | 5 |
7 files changed, 19 insertions, 9 deletions
@@ -18,6 +18,7 @@ GTAGS # Configure artifacts /lib/ +/m4/ ABOUT-NLS INSTALL Makefile diff --git a/bootstrap.conf b/bootstrap.conf index 066c9e1b..87533d13 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -57,4 +57,5 @@ fdl findprog-in getloadavg host-cpu-c-abi -make-glob" +make-glob +make-macros" diff --git a/configure.ac b/configure.ac index 270fc5e8..51817b2c 100644 --- a/configure.ac +++ b/configure.ac @@ -110,9 +110,6 @@ AS_IF([test "$make_cv_file_timestamp_hi_res" = yes], ]) ]) -# Check for DOS-style pathnames. -pds_AC_DOS_PATHS - # See if we have a standard version of gettimeofday(). Since actual # implementations can differ, just make sure we have the most common # one. diff --git a/m4/acinclude.m4 b/gl/m4/acinclude.m4 index a1edb44f..a1edb44f 100644 --- a/m4/acinclude.m4 +++ b/gl/m4/acinclude.m4 diff --git a/m4/dospaths.m4 b/gl/m4/dospaths.m4 index c8c9d832..c8c9d832 100644 --- a/m4/dospaths.m4 +++ b/gl/m4/dospaths.m4 diff --git a/gl/modules/make-macros b/gl/modules/make-macros new file mode 100644 index 00000000..c9ac32e2 --- /dev/null +++ b/gl/modules/make-macros @@ -0,0 +1,16 @@ +Description: +Install m4 macros for GNU make. + +Files: +m4/acinclude.m4 +m4/dospaths.m4 + +configure.ac: +# Check for DOS-style pathnames. +pds_AC_DOS_PATHS + +License: +GPLv3+ + +Maintainer: +gnumake diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 244385ac..00000000 --- a/m4/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -* -!/.gitignore -!/aclocal.m4 -!/dospaths.m4 - |