From: Bruno Haible <bruno@clisp.org>
Date: Fri, 25 Apr 2025 12:29:20 +0000 (+0200)
Subject: Modula-2 support: Fix VPATH builds.
X-Git-Tag: v0.25~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=204b0aadca2c976d6d9501462f031a19a23b1faf;p=thirdparty%2Fgettext.git

Modula-2 support: Fix VPATH builds.

* gettext-runtime/intl-modula2/Makefile.am (install-modula2-sources): Take
Libintl.def from the build dir, not from the source dir.
* gettext-tools/tests/lang-modula2: Search for Libintl.def in the build dir,
not in the source dir.
---

diff --git a/gettext-runtime/intl-modula2/Makefile.am b/gettext-runtime/intl-modula2/Makefile.am
index e17af9761..c3dbf23a8 100644
--- a/gettext-runtime/intl-modula2/Makefile.am
+++ b/gettext-runtime/intl-modula2/Makefile.am
@@ -96,8 +96,8 @@ uninstall-local: uninstall-modula2-sources
 install-modula2-sources:
 	$(MKDIR_P) $(DESTDIR)$(m2includedir)
 	@for f in Libintl.def; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(m2includedir)/$$f"; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(m2includedir)/$$f; \
+	  echo "$(INSTALL_DATA) $$f $(DESTDIR)$(m2includedir)/$$f"; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(m2includedir)/$$f; \
 	done
 
 installdirs-modula2-sources:
diff --git a/gettext-tools/tests/lang-modula2 b/gettext-tools/tests/lang-modula2
index 13d4c9341..b4b111e7a 100644
--- a/gettext-tools/tests/lang-modula2
+++ b/gettext-tools/tests/lang-modula2
@@ -110,7 +110,7 @@ test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
-${M2C} ${M2FLAGS} -I"$abs_top_srcdir"/../gettext-runtime/intl-modula2 \
+${M2C} ${M2FLAGS} -I"$top_builddir"/../gettext-runtime/intl-modula2 \
        -c -fscaffold-main prog.mod \
   || Exit 1