[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Attempt at separate directory for non-gnulib m4 f
From: |
Gavin D. Smith |
Subject: |
branch master updated: Attempt at separate directory for non-gnulib m4 files (top level) |
Date: |
Sat, 19 Oct 2024 14:28:04 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 2e02b22bcf Attempt at separate directory for non-gnulib m4 files (top
level)
2e02b22bcf is described below
commit 2e02b22bcfeea76830a51ce7b6224d60c311202b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 19 19:17:27 2024 +0100
Attempt at separate directory for non-gnulib m4 files (top level)
* configure.ac (AC_CONFIG_MACRO_DIRS): Add with value of
"build-aux/m4 gnulib/m4". This means that gettextize can
install files under build-aux/m4, not in the same directory
as files from gnulib.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I build-aux/m4
* build-aux/m4: add directory
* gnulib/m4: remove several files that are only added by
gettextize, not by gnulib --add-import
---
ChangeLog | 14 ++++++++++++++
Makefile.am | 2 +-
{gnulib => build-aux}/m4/gettext.m4 | 0
{gnulib => build-aux}/m4/intlmacosx.m4 | 0
{gnulib => build-aux}/m4/nls.m4 | 0
{gnulib => build-aux}/m4/po.m4 | 0
{gnulib => build-aux}/m4/progtest.m4 | 0
configure.ac | 1 +
8 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 3f079e10a9..00d1884e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-10-19 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Attempt at separate directory for non-gnulib m4 files (top level)
+
+ * configure.ac (AC_CONFIG_MACRO_DIRS): Add with value of
+ "build-aux/m4 gnulib/m4". This means that gettextize can
+ install files under build-aux/m4, not in the same directory
+ as files from gnulib.
+ * Makefile.am (ACLOCAL_AMFLAGS): Add -I build-aux/m4
+
+ * build-aux/m4: add directory
+ * gnulib/m4: remove several files that are only added by
+ gettextize, not by gnulib --add-import
+
2024-10-19 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/XS: re-run "gettextize" and track files in
diff --git a/Makefile.am b/Makefile.am
index 5c42ce5bc1..dda3e9ccbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Find our headers and gnulib headers.
-ACLOCAL_AMFLAGS = -I gnulib/m4
+ACLOCAL_AMFLAGS = -I build-aux/m4 -I gnulib/m4
# Wrapper for the build environment.
noinst_SCRIPTS = pre-inst-env
diff --git a/gnulib/m4/gettext.m4 b/build-aux/m4/gettext.m4
similarity index 100%
rename from gnulib/m4/gettext.m4
rename to build-aux/m4/gettext.m4
diff --git a/gnulib/m4/intlmacosx.m4 b/build-aux/m4/intlmacosx.m4
similarity index 100%
rename from gnulib/m4/intlmacosx.m4
rename to build-aux/m4/intlmacosx.m4
diff --git a/gnulib/m4/nls.m4 b/build-aux/m4/nls.m4
similarity index 100%
rename from gnulib/m4/nls.m4
rename to build-aux/m4/nls.m4
diff --git a/gnulib/m4/po.m4 b/build-aux/m4/po.m4
similarity index 100%
rename from gnulib/m4/po.m4
rename to build-aux/m4/po.m4
diff --git a/gnulib/m4/progtest.m4 b/build-aux/m4/progtest.m4
similarity index 100%
rename from gnulib/m4/progtest.m4
rename to build-aux/m4/progtest.m4
diff --git a/configure.ac b/configure.ac
index ff90e4b1dc..59f0018f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ AC_CONFIG_AUX_DIR([build-aux])
dnl tar-ustar because we have long filenames for some test files.
AM_INIT_AUTOMAKE([1.16.1 dist-xz
info-in-builddir parallel-tests tar-ustar])
+AC_CONFIG_MACRO_DIRS([build-aux/m4 gnulib/m4])
# Where to generate output; srcdir location.
AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Attempt at separate directory for non-gnulib m4 files (top level),
Gavin D. Smith <=