This reverts commit
df6f91c as the evaluation of the passed shell
variable happens at the wrong time in the references generated by
m4/non-recursive-gnulib-prefix-hack.m4
Revert to the hardcoded "lib/".
* lib/git-merge-changelog.c (compute_differences):
Adjust to diffseq.h changes.
-2016-10-22 Bruno Haible <bruno@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.
-
2016-10-22 Bruno Haible <bruno@clisp.org>
iconv: Avoid compilation error when bootstrapping GNU libiconv.
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([$gl_source_base])
+ dnl Note we can't currently pass $gl_source_base instead of 'lib',
+ dnl because $gl_source_base is unset or the wrong value in the references
+ dnl generated in m4/non-recursive-gnulib-prefix-hack.m4
+ gl_NON_RECURSIVE_GNULIB_PREFIX_HACK([lib])
])
Makefile.am: