diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2022-07-25 09:54:49 +0100 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2022-07-25 10:00:31 +0100 |
| commit | fab5dca74c099b1663dce30d9e11c2d83ecf3078 (patch) | |
| tree | 53ef0824d8544026280b3816ad8703534e8b3d75 | |
| parent | 54660e5b08524bd8746f7492bb4f88d294477543 (diff) | |
gnulib: remove use of deprecated module non-recursive-gnulib-prefix-hack
Use gnulib-tool’s --automake-subdir option instead.
Thanks, Bruno Haible.
| -rw-r--r-- | bootstrap.conf | 5 | ||||
| -rw-r--r-- | build-aux/.gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| m--------- | gnulib | 0 |
4 files changed, 2 insertions, 10 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 9d5f694..d688891 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -33,7 +33,6 @@ gnulib_modules=" gnupload maintainer-makefile mbsrtowcs - non-recursive-gnulib-prefix-hack progname propername readme-release @@ -81,7 +80,7 @@ if test $gettext_external = 1; then ' fi -gnulib_tool_option_extras="--makefile-name=gnulib.mk" +gnulib_tool_option_extras="--makefile-name=gnulib.mk --automake-subdir" # Build prerequisites buildreq="\ @@ -95,8 +94,6 @@ bootstrap_post_import_hook () { # Automake requires that ChangeLog exist. touch ChangeLog || return 1 - # Massage lib/gnulib.mk before using it later in the bootstrapping process. - build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk } # File that should exist in the top directory of a checked out hierarchy, diff --git a/build-aux/.gitignore b/build-aux/.gitignore index e6835de..8828c65 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -20,5 +20,4 @@ /useless-if-before-free /vc-list-files /gnu-web-doc-update -/prefix-gnulib-mk /gitlog-to-changelog diff --git a/configure.ac b/configure.ac index 6d52c41..9a76cb8 100644 --- a/configure.ac +++ b/configure.ac @@ -17,11 +17,7 @@ AC_INIT([GNU Hello], dnl Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([ - 1.11.1 - readme-alpha - subdir-objects -]) +AM_INIT_AUTOMAKE([1.11.1 readme-alpha subdir-objects]) dnl Minimum Autoconf version required. AC_PREREQ([2.64]) diff --git a/gnulib b/gnulib -Subproject bbaba6ce591b94c8fca491f4ef019187cd17152 +Subproject f00af4baf2c7416c5d7c4674c072ef2a51e4066 |