From 376beb46f0d1337c69accbc85ab1bb9daf99c80b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 11 Oct 2024 19:53:35 +0200
Subject: [PATCH] build: Add support for --enable-relocatable in mingw builds
 on Cygwin hosts, part 2.

Reported by Michele Locati <michele@locati.it> in
<https://savannah.gnu.org/bugs/?66319>.

* gettext-tools/configure.ac: Invoke gl_CONFIGMAKE_PREP and fix up the values of
pkgdatadir, pkgincludedir, pkglibdir, pkglibexecdir.
Invoke gl_BUILD_TO_HOST_LIBDIR, gl_BUILD_TO_HOST_LIBEXECDIR,
gl_BUILD_TO_HOST_PKGDATADIR, gl_BUILD_TO_HOST_PKGLIBDIR.
* gettext-tools/src/Makefile.am (pkgdatadir, pkglibdir, pkglibexecdir): Remove
variables.
(jardir): Simplify.
(jardir_c_make, projectsdir_c_make): New variables.
(*_CPPFLAGS): Fix value of BISON_LOCALEDIR, GETTEXTJAR, LIBDIR, LIBEXECDIR,
GETTEXTDATADIR, PROJECTSDIR.
---
 gettext-tools/configure.ac    | 26 +++++++++++++++++++++++++-
 gettext-tools/src/Makefile.am | 23 +++++++++++++----------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 1542d9ba6..b9c131170 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -26,10 +26,34 @@ AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
+dnl They should have the suffix '/gettext' by default, not '/gettext-tools'.
+if test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}'; then
+  docdir='${datarootdir}/doc/gettext'
+fi
+gl_CONFIGMAKE_PREP
+if test "$pkgdatadir" = '${datadir}/${PACKAGE}'; then
+  pkgdatadir='${datadir}/gettext'
+fi
+if test "$pkgincludedir" = '${includedir}/${PACKAGE}'; then
+  pkgincludedir='${includedir}/gettext'
+fi
+if test "$pkglibdir" = '${libdir}/${PACKAGE}'; then
+  pkglibdir='${libdir}/gettext'
+fi
+if test "$pkglibexecdir" = '${libexecdir}/${PACKAGE}'; then
+  pkglibexecdir='${libexecdir}/gettext'
+fi
 
 dnl Define bindir_c and bindir_c_make.
 gl_BUILD_TO_HOST_BINDIR
+dnl Define libdir_c and libdir_c_make.
+gl_BUILD_TO_HOST_LIBDIR
+dnl Define libexecdir_c and libexecdir_c_make.
+gl_BUILD_TO_HOST_LIBEXECDIR
+dnl Define pkgdatadir_c and pkgdatadir_c_make.
+gl_BUILD_TO_HOST_PKGDATADIR
+dnl Define pkglibdir_c and pkglibdir_c_make.
+gl_BUILD_TO_HOST_PKGLIBDIR
 dnl Define pkglibexecdir_c and pkglibexecdir_c_make.
 gl_BUILD_TO_HOST_PKGLIBEXECDIR
 
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 27fbd8b3b..cd94c3895 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -94,12 +94,15 @@ noinst_HEADERS = \
 
 EXTRA_DIST += FILES project-id
 
-jardir = $(datadir)/gettext
-pkgdatadir = $(datadir)/gettext
+# The following are already set through configmake.m4 and configure.ac:
+#pkgdatadir = $(datadir)/gettext
+#pkglibdir = $(libdir)/gettext
+#pkglibexecdir = $(libexecdir)/gettext
+jardir = $(pkgdatadir)
+jardir_c_make = $(pkgdatadir_c_make)
 projectsdir = $(pkgdatadir)/projects
+projectsdir_c_make = $(pkgdatadir_c_make)\"/projects\"
 schemadir = $(pkgdatadir)/schema
-pkglibdir = $(libdir)/gettext
-pkglibexecdir = $(libexecdir)/gettext
 
 # Note that Automake's $(DEFAULT_INCLUDES) already contains
 # -I. -I$(srcdir) -I$(top_builddir).
@@ -110,13 +113,13 @@ AM_CPPFLAGS = \
   -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
   -I../../gettext-runtime/intl -I$(top_srcdir)/../gettext-runtime/intl
 DEFS = \
-  -DLOCALEDIR=$(localedir_c_make) -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
+  -DLOCALEDIR=$(localedir_c_make) -DBISON_LOCALEDIR=$(BISON_LOCALEDIR_c_make) \
   -DUSEJAVA=$(USEJAVA) \
-  -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
-  -DLIBDIR=\"$(libdir)\" \
-  -DLIBEXECDIR=\"$(libexecdir)\" \
-  -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
-  -DPROJECTSDIR=\"$(projectsdir)\" \
+  -DGETTEXTJAR=$(jardir_c_make)\"/gettext.jar\" \
+  -DLIBDIR=$(libdir_c_make) \
+  -DLIBEXECDIR=$(libexecdir_c_make) \
+  -DGETTEXTDATADIR=$(pkgdatadir_c_make) \
+  -DPROJECTSDIR=$(projectsdir_c_make) \
   -DEXEEXT=\"@EXEEXT@\" @DEFS@
 
 # Enable more warning options in this directory.
-- 
2.47.2