On Sat, Oct 22, 2016 at 10:25 AM, Bruno Haible <br...@clisp.org> wrote: > This is better now. But still better would be to not hardcode 'lib' at all, > and instead use whatever value was passed to gnulib-tool via --source-base. > Below is a proposed patch. (The variable $gl_source_base is already used in a > similar way in the modules 'localcharset' and 'relocatable-prog'.) > Untested on my side; can you please test it the next time you happen to > build coreutils? > > Bruno > > > 2016-10-22 Bruno Haible <br...@clisp.org> > > 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. > > diff --git a/modules/non-recursive-gnulib-prefix-hack > b/modules/non-recursive-gnulib-prefix-hack > index 80bc27f..f938d30 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:
Nice improvement. I've confirmed that with that, coreutils still bootstraps and passes "make distcheck". Thank you.
