From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 7 Nov 2016 12:50:24 +0000 (+0000)
Subject: non-recursive-gnulib-prefix-hack: revert use of parameterized 'lib' dir
X-Git-Tag: v1.0~6564
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=012262350494958b70da16b43ed9acf24ee7fbc1;p=gnulib.git

non-recursive-gnulib-prefix-hack: revert use of parameterized 'lib' dir

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/".
---

diff --git a/ChangeLog b/ChangeLog
index ef74cb4a97..f2b44269c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,13 +111,6 @@
 	* 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.
diff --git a/modules/non-recursive-gnulib-prefix-hack b/modules/non-recursive-gnulib-prefix-hack
index f938d30a29..a4b13736cb 100644
--- a/modules/non-recursive-gnulib-prefix-hack
+++ b/modules/non-recursive-gnulib-prefix-hack
@@ -12,7 +12,10 @@ 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([$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: