texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Separate directory for non-gnulib m4 files (XS)


From: Gavin D. Smith
Subject: branch master updated: Separate directory for non-gnulib m4 files (XS)
Date: Sat, 19 Oct 2024 15:02:00 -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 7fa44614c5 Separate directory for non-gnulib m4 files (XS)
7fa44614c5 is described below

commit 7fa44614c5b5c0a1cf8b3210c03d0f2c1e6f436c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 19 20:00:51 2024 +0100

    Separate directory for non-gnulib m4 files (XS)
    
    * tp/Texinfo/XS/m4, tp/Texinfo/XS/build-aux/m4: Move directory.
    * tp/Texinfo/XS/configure.ac (AC_CONFIG_MACRO_DIRS):
    Change 'm4' to 'build-aux/m4'.
    * tp/Texinfo/XS/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
---
 .gitignore                                     | 10 +++++-----
 ChangeLog                                      |  9 +++++++++
 tp/Texinfo/XS/Makefile.am                      |  2 +-
 tp/Texinfo/XS/{ => build-aux}/m4/gettext.m4    |  0
 tp/Texinfo/XS/{ => build-aux}/m4/intlmacosx.m4 |  0
 tp/Texinfo/XS/{ => build-aux}/m4/nls.m4        |  0
 tp/Texinfo/XS/{ => build-aux}/m4/po.m4         |  0
 tp/Texinfo/XS/{ => build-aux}/m4/progtest.m4   |  0
 tp/Texinfo/XS/configure.ac                     |  2 +-
 9 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index a48cd85bd2..1de728d65c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,11 +125,11 @@ tp/Texinfo/XS/gnulib/lib/wctype.h
 
 tp/Texinfo/XS/gnulib/lib/uniconv/*.lo
 
-tp/Texinfo/XS/m4/libtool.m4
-tp/Texinfo/XS/m4/ltoptions.m4
-tp/Texinfo/XS/m4/ltsugar.m4
-tp/Texinfo/XS/m4/ltversion.m4
-tp/Texinfo/XS/m4/lt~obsolete.m4
+tp/Texinfo/XS/build-aux/m4/libtool.m4
+tp/Texinfo/XS/build-aux/m4/ltoptions.m4
+tp/Texinfo/XS/build-aux/m4/ltsugar.m4
+tp/Texinfo/XS/build-aux/m4/ltversion.m4
+tp/Texinfo/XS/build-aux/m4/lt~obsolete.m4
 
 tp/Texinfo/XS/gnulib/po/*.gmo
 tp/Texinfo/XS/gnulib/po/POTFILES
diff --git a/ChangeLog b/ChangeLog
index 8fd3c71f01..c158be6d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-10-19  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Separate directory for non-gnulib m4 files (XS)
+
+       * tp/Texinfo/XS/m4, tp/Texinfo/XS/build-aux/m4: Move directory.
+       * tp/Texinfo/XS/configure.ac (AC_CONFIG_MACRO_DIRS):
+       Change 'm4' to 'build-aux/m4'.
+       * tp/Texinfo/XS/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
+
 2024-10-19  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/customization_options.c
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 7c654d4669..91c076226b 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(srcdir)
 GNULIB_CPPFLAGS = -I$(srcdir)/gnulib/lib \
   -I$(builddir)/gnulib/lib
 
-ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
+ACLOCAL_AMFLAGS = -I build-aux/m4 -I gnulib/m4
 
 SUBDIRS=gnulib/lib gnulib/po
 
diff --git a/tp/Texinfo/XS/m4/gettext.m4 b/tp/Texinfo/XS/build-aux/m4/gettext.m4
similarity index 100%
rename from tp/Texinfo/XS/m4/gettext.m4
rename to tp/Texinfo/XS/build-aux/m4/gettext.m4
diff --git a/tp/Texinfo/XS/m4/intlmacosx.m4 
b/tp/Texinfo/XS/build-aux/m4/intlmacosx.m4
similarity index 100%
rename from tp/Texinfo/XS/m4/intlmacosx.m4
rename to tp/Texinfo/XS/build-aux/m4/intlmacosx.m4
diff --git a/tp/Texinfo/XS/m4/nls.m4 b/tp/Texinfo/XS/build-aux/m4/nls.m4
similarity index 100%
rename from tp/Texinfo/XS/m4/nls.m4
rename to tp/Texinfo/XS/build-aux/m4/nls.m4
diff --git a/tp/Texinfo/XS/m4/po.m4 b/tp/Texinfo/XS/build-aux/m4/po.m4
similarity index 100%
rename from tp/Texinfo/XS/m4/po.m4
rename to tp/Texinfo/XS/build-aux/m4/po.m4
diff --git a/tp/Texinfo/XS/m4/progtest.m4 
b/tp/Texinfo/XS/build-aux/m4/progtest.m4
similarity index 100%
rename from tp/Texinfo/XS/m4/progtest.m4
rename to tp/Texinfo/XS/build-aux/m4/progtest.m4
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 780dc3e5a0..dcbf21c5c2 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -13,7 +13,7 @@
 AC_INIT([GNU Texinfo], [7.1.90])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
-AC_CONFIG_MACRO_DIRS([m4 gnulib/m4])
+AC_CONFIG_MACRO_DIRS([build-aux/m4 gnulib/m4])
 
 CONVERTER=texi2any
 AC_SUBST([CONVERTER])



reply via email to

[Prev in Thread] Current Thread [Next in Thread]