aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2020-07-21 15:55:42 +0300
committerArnold D. Robbins <arnold@skeeve.com>2020-07-21 15:55:42 +0300
commitbba10f01c5749ae0d290f123e3312a5c1cf840a8 (patch)
treea8e7eb45def4b40733829d01c0e08c5bcbbe8441
parente0d37f069b77aa549697403d2da556e9cfda991b (diff)
downloadegawk-bba10f01c5749ae0d290f123e3312a5c1cf840a8.tar.gz
egawk-bba10f01c5749ae0d290f123e3312a5c1cf840a8.tar.bz2
egawk-bba10f01c5749ae0d290f123e3312a5c1cf840a8.zip
Move aux files into build-aux directory.
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in24
-rw-r--r--awklib/Makefile.in8
-rw-r--r--build-aux/ChangeLog4
-rwxr-xr-xbuild-aux/ar-lib (renamed from ar-lib)0
-rwxr-xr-xbuild-aux/compile (renamed from compile)0
-rwxr-xr-xbuild-aux/config.guess (renamed from config.guess)0
-rwxr-xr-xbuild-aux/config.rpath (renamed from config.rpath)0
-rwxr-xr-xbuild-aux/config.sub (renamed from config.sub)0
-rwxr-xr-xbuild-aux/depcomp (renamed from depcomp)0
-rwxr-xr-xbuild-aux/install-sh (renamed from install-sh)0
-rwxr-xr-xbuild-aux/missing (renamed from missing)0
-rwxr-xr-xbuild-aux/ylwrap (renamed from ylwrap)0
-rwxr-xr-xconfigure13
-rw-r--r--configure.ac6
-rw-r--r--doc/Makefile.in9
-rw-r--r--extras/Makefile.in5
-rw-r--r--helpers/ChangeLog5
-rwxr-xr-xhelpers/update-aux.sh2
-rw-r--r--support/Makefile.in8
-rw-r--r--test/Makefile.in6
21 files changed, 58 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 38735443..138b7f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2020-07-21 Arnold D. Robbins <arnold@skeeve.com>
* configure.ac (AM_INIT_AUTOMAKE): Update to 1.16.
+ * ar-lib, compile, config.guess, config.rpath, config.sub,
+ depcomp, install-sh, missing, ylwrap: Moved to build-aux.
2020-07-20 gettextize <bug-gnu-gettext@gnu.org>
diff --git a/Makefile.in b/Makefile.in
index f1e8f0d8..43253889 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,7 +137,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -171,7 +171,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/array.Po ./$(DEPDIR)/awkgram.Po \
./$(DEPDIR)/builtin.Po ./$(DEPDIR)/cint_array.Po \
@@ -204,7 +204,7 @@ AM_V_YACC = $(am__v_YACC_@AM_V@)
am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
am__v_YACC_0 = @echo " YACC " $@;
am__v_YACC_1 =
-YLWRAP = $(top_srcdir)/ylwrap
+YLWRAP = $(top_srcdir)/build-aux/ylwrap
SOURCES = $(gawk_SOURCES)
DIST_SOURCES = $(gawk_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -278,10 +278,20 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = support . extension extras doc awklib po test
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configh.in ABOUT-NLS \
- AUTHORS COPYING ChangeLog INSTALL NEWS README TODO ar-lib \
- awkgram.c command.c compile config.guess config.rpath \
- config.sub depcomp install-sh missing mkinstalldirs ylwrap
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configh.in \
+ $(top_srcdir)/build-aux/ar-lib $(top_srcdir)/build-aux/compile \
+ $(top_srcdir)/build-aux/config.guess \
+ $(top_srcdir)/build-aux/config.rpath \
+ $(top_srcdir)/build-aux/config.sub \
+ $(top_srcdir)/build-aux/depcomp \
+ $(top_srcdir)/build-aux/install-sh \
+ $(top_srcdir)/build-aux/missing $(top_srcdir)/build-aux/ylwrap \
+ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+ awkgram.c build-aux/ChangeLog build-aux/ar-lib \
+ build-aux/compile build-aux/config.guess \
+ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+ build-aux/install-sh build-aux/missing build-aux/texinfo.tex \
+ build-aux/ylwrap command.c missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 66e3bbbc..33e3f3df 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -127,7 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -152,7 +152,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/grcat.Po ./$(DEPDIR)/pwcat.Po
am__mv = mv -f
@@ -194,8 +194,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs ChangeLog
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/awk
pkglibexecdir = $(libexecdir)/awk
diff --git a/build-aux/ChangeLog b/build-aux/ChangeLog
new file mode 100644
index 00000000..b045247e
--- /dev/null
+++ b/build-aux/ChangeLog
@@ -0,0 +1,4 @@
+2020-07-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ar-lib, compile, config.guess, config.rpath, config.sub,
+ depcomp, install-sh, missing: Moved here from parent directory.
diff --git a/ar-lib b/build-aux/ar-lib
index 1e9388e2..1e9388e2 100755
--- a/ar-lib
+++ b/build-aux/ar-lib
diff --git a/compile b/build-aux/compile
index 23fcba01..23fcba01 100755
--- a/compile
+++ b/build-aux/compile
diff --git a/config.guess b/build-aux/config.guess
index e94095c5..e94095c5 100755
--- a/config.guess
+++ b/build-aux/config.guess
diff --git a/config.rpath b/build-aux/config.rpath
index 24be79cf..24be79cf 100755
--- a/config.rpath
+++ b/build-aux/config.rpath
diff --git a/config.sub b/build-aux/config.sub
index 3d9a8dc3..3d9a8dc3 100755
--- a/config.sub
+++ b/build-aux/config.sub
diff --git a/depcomp b/build-aux/depcomp
index 6b391623..6b391623 100755
--- a/depcomp
+++ b/build-aux/depcomp
diff --git a/install-sh b/build-aux/install-sh
index 20d8b2ea..20d8b2ea 100755
--- a/install-sh
+++ b/build-aux/install-sh
diff --git a/missing b/build-aux/missing
index 8d0eaad2..8d0eaad2 100755
--- a/missing
+++ b/build-aux/missing
diff --git a/ylwrap b/build-aux/ylwrap
index d1533360..d1533360 100755
--- a/ylwrap
+++ b/build-aux/ylwrap
diff --git a/configure b/configure
index 31f67174..ed525950 100755
--- a/configure
+++ b/configure
@@ -2609,15 +2609,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$INSTALL" = ""
then
- INSTALL="$srcdir/install-sh -c"
+ INSTALL="$srcdir/build-aux/install-sh -c"
export INSTALL
fi
-am__api_version='1.16'
+
ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2633,7 +2633,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2645,6 +2645,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+am__api_version='1.16'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -3223,8 +3226,6 @@ END
fi
-
-
# Check whether --enable-lint was given.
if test "${enable_lint+set}" = set; then :
enableval=$enable_lint; if test "$enableval" = no
diff --git a/configure.ac b/configure.ac
index f72c2739..c25730b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,14 +35,16 @@ AC_INIT([GNU Awk],[5.1.0],[bug-gawk@gnu.org],[gawk])
if test "$INSTALL" = ""
then
- INSTALL="$srcdir/install-sh -c"
+ INSTALL="$srcdir/build-aux/install-sh -c"
export INSTALL
fi
AC_PREREQ([2.69])
-AM_INIT_AUTOMAKE([1.16 dist-xz dist-lzip])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE([1.16 dist-xz dist-lzip])
AC_ARG_ENABLE([lint],
[AS_HELP_STRING([--disable-lint],[do not compile in gawk lint checking])],
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 12a8ebe4..c457ea1a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -128,7 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -176,7 +176,8 @@ am__v_texidevnull_0 = > /dev/null
am__v_texidevnull_1 =
INFO_DEPS = $(srcdir)/gawk.info $(srcdir)/gawkinet.info \
$(srcdir)/gawkworkflow.info
-am__TEXINFO_TEX_DIR = $(srcdir)
+TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
DVIS = gawk.dvi gawkinet.dvi gawkworkflow.dvi
PDFS = gawk.pdf gawkinet.pdf gawkworkflow.pdf
PSS = gawk.ps gawkinet.ps gawkworkflow.ps
@@ -224,8 +225,8 @@ man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
- ChangeLog texinfo.tex
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/texinfo.tex ChangeLog texinfo.tex
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
diff --git a/extras/Makefile.in b/extras/Makefile.in
index 92d2b89b..10a229a2 100644
--- a/extras/Makefile.in
+++ b/extras/Makefile.in
@@ -128,7 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -181,8 +181,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(profiledir)"
DATA = $(profile_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
- ChangeLog
+am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
diff --git a/helpers/ChangeLog b/helpers/ChangeLog
index fd6d6d7d..beded9d5 100644
--- a/helpers/ChangeLog
+++ b/helpers/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * update-aux.sh: Adjust for presence of build-aux in main
+ directory.
+
2019-06-18 Arnold D. Robbins <arnold@skeeve.com>
* 5.0.1: Release tar ball made.
diff --git a/helpers/update-aux.sh b/helpers/update-aux.sh
index 0d758486..3ab54144 100755
--- a/helpers/update-aux.sh
+++ b/helpers/update-aux.sh
@@ -12,7 +12,7 @@ GL=/usr/local/src/Gnu/gnulib/build-aux
for i in $(cd $GL ; echo *)
do
- for dir in . extension/build-aux doc
+ for dir in ./build-aux extension/build-aux doc
do
if [ -f $GL/$i ] && [ -f $dir/$i ]
then
diff --git a/support/Makefile.in b/support/Makefile.in
index 3733e699..b982b8cc 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -128,7 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -157,7 +157,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/dfa.Po ./$(DEPDIR)/getopt.Po \
./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/localeinfo.Po \
@@ -201,8 +201,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
- $(top_srcdir)/mkinstalldirs ChangeLog
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
diff --git a/test/Makefile.in b/test/Makefile.in
index 981bdb0f..b7abd5c8 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -127,7 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -151,8 +151,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Maketests \
- $(top_srcdir)/mkinstalldirs ChangeLog README
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Maketests ChangeLog \
+ README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 15:10:44 +0000