From: Nick Bowler <nbowler@draconx.ca>
Date: Sun, 24 Jan 2021 03:16:47 +0000 (-0500)
Subject: fix-gnulib: Unbreak symbol renaming feature.
X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/commitdiff_plain/d4be634567f46d2af2dc0e78171f3639f2ff039f

fix-gnulib: Unbreak symbol renaming feature.

Unifying the libtool and non-libtool variable names in fix-gnulib
inadvertently broke glconfig.mk, which references the previous
gnulib_lt_objects variable name.  Restore the old variable name
in the libtool case.
---

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index c407d6f..a59e4a6 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright © 2011-2014, 2020 Nick Bowler
+# Copyright © 2011-2014, 2020-2021 Nick Bowler
 #
 # Prepare the Gnulib tree for inclusion into a non-recursive automake build.
 # While the output of gnulib-tool is "include"-able if the --makefile-name
@@ -252,7 +252,8 @@ EOF
 } continue { s/(\n.)/\\\1/g; print; };
 
 print <<'EOF' if ($use_libtool);
-gnulib_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS)
+gnulib_lt_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS)
+gnulib_objects = $(gnulib_lt_objects)
 $(gnulib_objects): $(gnulib_headers)
 EOF
 print <<'EOF' if (!$use_libtool);