Do export the symbol 'locale_charset' (needed by GNU bash).
diff --git a/ChangeLog b/ChangeLog
index c64970e..2f288f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-23 Bruno Haible <bruno@clisp.org>
+
+ Do export the symbol 'locale_charset' (needed by GNU bash).
+ * lib/Makefile.in (DEFS): Define also BUILDING_LIBCHARSET.
+
2019-09-01 Bruno Haible <bruno@clisp.org>
build: Add support for shallow-cloning of subdirectories.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 47a6aec..737ecf6 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -20,11 +20,16 @@
LDFLAGS_no =
INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include -I.. -I$(srcdir)/..
# -DBUILDING_LIBICONV: Change expansion of LIBICONV_DLL_EXPORTED macro.
+# -DBUILDING_LIBCHARSET: Change expansion of LIBCHARSET_DLL_EXPORTED macro in
+# localcharset.h.
# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
-DEFS = -DLIBDIR=\"$(libdir)\" -DBUILDING_LIBICONV -DBUILDING_DLL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
--Dset_relocation_prefix=libiconv_set_relocation_prefix \
--Drelocate=libiconv_relocate -Drelocate2=libiconv_relocate2 @DEFS@
+DEFS = \
+ -DLIBDIR=\"$(libdir)\" \
+ -DBUILDING_LIBICONV -DBUILDING_LIBCHARSET -DBUILDING_DLL \
+ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+ -Dset_relocation_prefix=libiconv_set_relocation_prefix \
+ -Drelocate=libiconv_relocate \
+ -Drelocate2=libiconv_relocate2 @DEFS@
LIBTOOL = @LIBTOOL@
LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
LIBTOOL_LINK = $(LIBTOOL) --mode=link
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 47ff385..833a3c4 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-23 Bruno Haible <bruno@clisp.org>
+
+ Allow libiconv to export the symbol 'locale_charset'.
+ * Makefile.in (install-lib): Install localcharset.h, not
+ localcharset.h.inst.
+
2019-12-22 Bruno Haible <bruno@clisp.org>
Mark a new version.
diff --git a/libcharset/Makefile.in b/libcharset/Makefile.in
index 51cc745..4df5842 100644
--- a/libcharset/Makefile.in
+++ b/libcharset/Makefile.in
@@ -39,7 +39,8 @@
cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
$(mkinstalldirs) $(includedir)
$(INSTALL_DATA) include/libcharset.h.inst $(includedir)/libcharset.h
- $(INSTALL_DATA) include/localcharset.h.inst $(includedir)/localcharset.h
+# Here, use the include file that contains LIBCHARSET_DLL_EXPORTED annotations.
+ $(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h
install : all force
cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
