From 26413ef170462bd4970a2a4aa31cebf3f54c3e7d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Oct 2025 18:41:00 +0200 Subject: [PATCH] Refactor: New subdirectory gettext-tools/autotools/. * gettext-tools/Makefile.am (SUBDIRS): Add autotools. Remove misc. (distdir2): Update. * gettext-tools/autotools/Makefile.am: Renamed from gettext-tools/misc/Makefile.am. * gettext-tools/autotools/archive.dir.tar: Renamed from gettext-tools/misc/archive.dir.tar. * gettext-tools/autotools/add-to-archive: Renamed from gettext-tools/misc/add-to-archive. * gettext-tools/autotools/cvsuser.c: Renamed from gettext-tools/misc/cvsuser.c. * gettext-tools/autotools/convert-archive.in: Renamed from gettext-tools/misc/convert-archive.in. * gettext-tools/autotools/autopoint.in: Renamed from gettext-tools/misc/autopoint.in. * gettext-tools/configure.ac: Update AC_CONFIG_FILES invocations. * gettext-tools/man/Makefile.am (man_MAN1AUTOTOOLS): Renamed from man_MAN1MISC. ($(man_MAN1AUTOTOOLS)): Renamed from $(man_MAN1MISC). (autopoint.1): Update. * gettext-tools/examples/po/Makefile.am (USE_BUILT_PROGS): Update. * gettext-tools/tests/autopoint-1: Update. * gettext-tools/tests/autopoint-2: Likewise. * gettext-tools/tests/autopoint-3: Likewise. * check-copyright-headers (func_check_file): Update. --- .gitignore | 12 ++++++------ Admin/release-steps | 10 +++++----- check-copyright-headers | 2 +- gettext-tools/Makefile.am | 4 ++-- gettext-tools/{misc => autotools}/Makefile.am | 2 +- gettext-tools/{misc => autotools}/add-to-archive | 0 gettext-tools/{misc => autotools}/archive.dir.tar | Bin gettext-tools/{misc => autotools}/autopoint.in | 0 .../{misc => autotools}/convert-archive.in | 0 gettext-tools/{misc => autotools}/cvsuser.c | 0 gettext-tools/configure.ac | 8 ++++---- gettext-tools/examples/po/Makefile.am | 4 ++-- gettext-tools/man/Makefile.am | 12 ++++++------ gettext-tools/tests/autopoint-1 | 2 +- gettext-tools/tests/autopoint-2 | 2 +- gettext-tools/tests/autopoint-3 | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) rename gettext-tools/{misc => autotools}/Makefile.am (97%) rename gettext-tools/{misc => autotools}/add-to-archive (100%) rename gettext-tools/{misc => autotools}/archive.dir.tar (100%) rename gettext-tools/{misc => autotools}/autopoint.in (100%) rename gettext-tools/{misc => autotools}/convert-archive.in (100%) rename gettext-tools/{misc => autotools}/cvsuser.c (100%) diff --git a/.gitignore b/.gitignore index e8be98271..b4b16db89 100644 --- a/.gitignore +++ b/.gitignore @@ -428,6 +428,7 @@ /gettext-tools/configure /gettext-tools/config.h.in /gettext-tools/Makefile.in +/gettext-tools/autotools/Makefile.in /gettext-tools/doc/Makefile.in /gettext-tools/emacs/Makefile.in /gettext-tools/examples/aclocal.m4 @@ -439,7 +440,6 @@ /gettext-tools/libgrep/Makefile.in /gettext-tools/m4/Makefile.in /gettext-tools/man/Makefile.in -/gettext-tools/misc/Makefile.in /gettext-tools/projects/Makefile.in /gettext-tools/src/Makefile.in /gettext-tools/styles/Makefile.in @@ -488,6 +488,7 @@ /gettext-runtime/man/textdomain.3.html /gettext-runtime/po/gettext-runtime.pot /gettext-runtime/po/stamp-po +/gettext-tools/autotools/archive.*.tar.* /gettext-tools/doc/version.texi /gettext-tools/doc/stamp-vti /gettext-tools/doc/gettext.info @@ -535,7 +536,6 @@ /gettext-tools/man/recode-sr-latin.1.html /gettext-tools/man/xgettext.1 /gettext-tools/man/xgettext.1.html -/gettext-tools/misc/archive.*.tar.* /gettext-tools/po/gettext-tools.pot /gettext-tools/po/stamp-po # Files generated by "make", using gperf: @@ -640,6 +640,10 @@ autom4te.cache/ /gettext-tools/javaexec.sh /gettext-tools/libtool /gettext-tools/stamp-h1 +/gettext-tools/autotools/Makefile +# (see DISTCLEANFILES in Makefile.am): +/gettext-tools/autotools/autopoint +/gettext-tools/autotools/convert-archive /gettext-tools/build-aux/xml-validate-10 /gettext-tools/build-aux/xml-validate-11 /gettext-tools/doc/Makefile @@ -654,10 +658,6 @@ autom4te.cache/ /gettext-tools/m4/Makefile /gettext-tools/man/Makefile /gettext-tools/man/x-to-1 -/gettext-tools/misc/Makefile -# (see DISTCLEANFILES in Makefile.am): -/gettext-tools/misc/autopoint -/gettext-tools/misc/convert-archive /gettext-tools/po/Makefile.in /gettext-tools/po/Makefile /gettext-tools/projects/Makefile diff --git a/Admin/release-steps b/Admin/release-steps index 39f4ed040..a0fc0c7c8 100644 --- a/Admin/release-steps +++ b/Admin/release-steps @@ -123,9 +123,9 @@ We assume that the following environment variables are set: gettext-runtime/src/ngettext.c gettext-runtime/src/printf_gettext.c gettext-runtime/src/printf_ngettext.c - gettext-tools/misc/autopoint.in - gettext-tools/misc/convert-archive.in - gettext-tools/misc/gettextize.in + gettext-tools/wizard/gettextize.in + gettext-tools/autotools/autopoint.in + gettext-tools/autotools/convert-archive.in gettext-tools/src/cldr-plurals.c gettext-tools/src/hostname.c gettext-tools/src/msgattrib.c @@ -161,7 +161,7 @@ We assume that the following environment variables are set: Update ARCHIVE_VERSION. - - gettext-tools/misc/autopoint.in + - gettext-tools/autotools/autopoint.in Update the 'case' statement around line 395 to include the latest release. @@ -219,7 +219,7 @@ We assume that the following environment variables are set: Make 'autopoint' work in the new release: - (cd gettext-tools/misc + (cd gettext-tools/autotools ./add-to-archive ../../gettext-$CURRENT_VERSION.tar.gz) Update the examples: diff --git a/check-copyright-headers b/check-copyright-headers index 7dd6db2ed..1e0ce0488 100755 --- a/check-copyright-headers +++ b/check-copyright-headers @@ -161,7 +161,7 @@ func_check_file () # This is a form, used for communication with the FSF. return 0 ;; - /gettext-tools/misc/archive.dir.tar ) + /gettext-tools/autotools/archive.dir.tar ) # This is an archive of files that were part of earlier gettext releases. # As a binary file, it cannot have a copyright header. return 0 ;; diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index cf1dd6006..53d901ba3 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4 -SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles wizard emacs misc man m4 tests system-tests gnulib-tests install-tests examples doc +SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles wizard autotools emacs man m4 tests system-tests gnulib-tests install-tests examples doc EXTRA_DIST = misc/disclaim-translations.txt MOSTLYCLEANFILES = core *.stackdump @@ -265,7 +265,7 @@ gen-man1: programs-for-distdir \ .PHONY: distdir2 distdir2: programs-for-distdir cd wizard && $(MAKE) $(AM_MAKEFLAGS) - cd misc && $(MAKE) $(AM_MAKEFLAGS) + cd autotools && $(MAKE) $(AM_MAKEFLAGS) cd examples && $(MAKE) $(AM_MAKEFLAGS) diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/autotools/Makefile.am similarity index 97% rename from gettext-tools/misc/Makefile.am rename to gettext-tools/autotools/Makefile.am index 7464b1d73..1730f0fe2 100644 --- a/gettext-tools/misc/Makefile.am +++ b/gettext-tools/autotools/Makefile.am @@ -1,4 +1,4 @@ -## Makefile for the gettext-tools/misc subdirectory of GNU gettext +## Makefile for the gettext-tools/autotools subdirectory of GNU gettext ## Copyright (C) 1995-2025 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/autotools/add-to-archive similarity index 100% rename from gettext-tools/misc/add-to-archive rename to gettext-tools/autotools/add-to-archive diff --git a/gettext-tools/misc/archive.dir.tar b/gettext-tools/autotools/archive.dir.tar similarity index 100% rename from gettext-tools/misc/archive.dir.tar rename to gettext-tools/autotools/archive.dir.tar diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/autotools/autopoint.in similarity index 100% rename from gettext-tools/misc/autopoint.in rename to gettext-tools/autotools/autopoint.in diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/autotools/convert-archive.in similarity index 100% rename from gettext-tools/misc/convert-archive.in rename to gettext-tools/autotools/convert-archive.in diff --git a/gettext-tools/misc/cvsuser.c b/gettext-tools/autotools/cvsuser.c similarity index 100% rename from gettext-tools/misc/cvsuser.c rename to gettext-tools/autotools/cvsuser.c diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index b288aa1dd..67ce19fb8 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -750,11 +750,11 @@ AC_CONFIG_FILES([styles/Makefile]) AC_CONFIG_FILES([wizard/Makefile]) AC_CONFIG_FILES([wizard/gettextize], [chmod a+x wizard/gettextize]) -AC_CONFIG_FILES([emacs/Makefile]) +AC_CONFIG_FILES([autotools/Makefile]) +AC_CONFIG_FILES([autotools/autopoint], [chmod a+x autotools/autopoint]) +AC_CONFIG_FILES([autotools/convert-archive], [chmod a+x autotools/convert-archive]) -AC_CONFIG_FILES([misc/Makefile]) -AC_CONFIG_FILES([misc/autopoint], [chmod a+x misc/autopoint]) -AC_CONFIG_FILES([misc/convert-archive], [chmod a+x misc/convert-archive]) +AC_CONFIG_FILES([emacs/Makefile]) AC_CONFIG_FILES([man/Makefile]) AC_CONFIG_FILES([man/x-to-1]) diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 76eadc4b3..e440e3684 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -263,8 +263,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) # The environment variable 'gettext_datadir' is used by autopoint. # The environment variable 'GETTEXTDATADIR' is used by xgettext. USE_BUILT_PROGS = \ - PATH="`pwd`/../../src$(PATH_SEPARATOR)`pwd`/../../misc$(PATH_SEPARATOR)$$PATH"; \ - gettext_datadir="`pwd`/../../misc"; export gettext_datadir; \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)`pwd`/../../autotools$(PATH_SEPARATOR)$$PATH"; \ + gettext_datadir="`pwd`/../../autotools"; export gettext_datadir; \ GETTEXTDATADIR="`cd '$(srcdir)/../..' && pwd`"; export GETTEXTDATADIR; hello-c.pot : $(POTFILES_DEPS) diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index 18a606561..6442a4c6c 100644 --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits EXTRA_DIST = # A manual page for each of the bin_PROGRAMS in src/Makefile.am -# and for each of the bin_SCRIPTS in wizard/Makefile.am, misc/Makefile.am. +# and for each of the bin_SCRIPTS in wizard/Makefile.am, autotools/Makefile.am. man_aux = \ msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \ @@ -40,9 +40,9 @@ msggrep.1 msginit.1 msguniq.1 \ recode-sr-latin.1 man_MAN1WIZARD = \ gettextize.1 -man_MAN1MISC = \ +man_MAN1AUTOTOOLS = \ autopoint.1 -man_MAN1 = $(man_MAN1SRC) $(man_MAN1WIZARD) $(man_MAN1MISC) +man_MAN1 = $(man_MAN1SRC) $(man_MAN1WIZARD) $(man_MAN1AUTOTOOLS) man_MANS = $(man_MAN1) man_HTML = \ @@ -127,12 +127,12 @@ $(man_MAN1WIZARD): help2man $(top_srcdir)/../.version gettextize.1: gettextize.x ../wizard/gettextize.in -$(man_MAN1MISC): help2man $(top_srcdir)/../.version +$(man_MAN1AUTOTOOLS): help2man $(top_srcdir)/../.version progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \ IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN) --version-option=--version-without-config" \ - ../misc/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@ + ../autotools/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@ -autopoint.1: autopoint.x ../misc/autopoint.in +autopoint.1: autopoint.x ../autotools/autopoint.in # Man pages in HTML format. diff --git a/gettext-tools/tests/autopoint-1 b/gettext-tools/tests/autopoint-1 index 19b01c530..e820ac099 100755 --- a/gettext-tools/tests/autopoint-1 +++ b/gettext-tools/tests/autopoint-1 @@ -16,7 +16,7 @@ ${AUTOCONF} >/dev/null 2>/dev/null \ rm -f configure.ac -gettext_datadir=$top_builddir/misc +gettext_datadir=$top_builddir/autotools export gettext_datadir # Check if sanity checks are actually working. diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2 index 1b41efa14..d34c5e1d3 100755 --- a/gettext-tools/tests/autopoint-2 +++ b/gettext-tools/tests/autopoint-2 @@ -16,7 +16,7 @@ ${AUTOCONF} >/dev/null 2>/dev/null \ rm -f configure.ac -gettext_datadir=$top_builddir/misc +gettext_datadir=$top_builddir/autotools export gettext_datadir # Check for not copying libintl source. diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 index d0ec54964..bf676e714 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 @@ -42,7 +42,7 @@ ${AUTOMAKE} --add-missing >/dev/null 2>/dev/null \ rm -f configure.ac Makefile.am -gettext_datadir=$top_builddir/misc +gettext_datadir=$top_builddir/autotools export gettext_datadir cat <configure.ac -- 2.47.3