From df6f91c65d60c1d9517eb08afccb1368f6a3ded6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 22 Oct 2016 19:17:26 +0200 Subject: [PATCH] non-recursive-gnulib-prefix-hack: Don't make assumptions about gnulib-tool's --source-base option value. * modules/non-recursive-gnulib-prefix-hack (configure.ac): Use gl_source_base. --- ChangeLog | 7 +++++++ modules/non-recursive-gnulib-prefix-hack | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2f31849398..1db20d736d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-10-22 Bruno Haible + + non-recursive-gnulib-prefix-hack: Don't make assumptions about + gnulib-tool's --source-base option value. + * modules/non-recursive-gnulib-prefix-hack (configure.ac): Use + gl_source_base. + 2016-10-22 Bruno Haible iconv: Avoid compilation error when bootstrapping GNU libiconv. diff --git a/modules/non-recursive-gnulib-prefix-hack b/modules/non-recursive-gnulib-prefix-hack index 80bc27f0bb..f938d30a29 100644 --- a/modules/non-recursive-gnulib-prefix-hack +++ b/modules/non-recursive-gnulib-prefix-hack @@ -12,7 +12,7 @@ configure.ac: dnl Run our hack near the end, just before config.status creation. dnl It must happen late, i.e., after gl_LIBOBJS has been finalized. AC_CONFIG_COMMANDS_PRE([ - gl_NON_RECURSIVE_GNULIB_PREFIX_HACK([lib]) + gl_NON_RECURSIVE_GNULIB_PREFIX_HACK([$gl_source_base]) ]) Makefile.am: -- 2.39.5