--- texinfo-7.0.3/tp/Texinfo/XS/Makefile.am	2023-11-15 19:29:43.605389464 +0200
+++ texinfo-7.0.3/tp/Texinfo/XS/Makefile.am	2023-11-15 19:58:12.194296619 +0200
@@ -53,7 +53,6 @@
 
 xs_LTLIBRARIES += MiscXS.la
 MiscXS_la_SOURCES = MiscXS.c misc.c miscxs.h ppport.h
-MiscXS_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la
 
 
 # TestXS.la has to be included in xs_LIBRARIES, and not noinst_LIBRARIES, 
@@ -70,18 +69,23 @@
 AM_CFLAGS += -I$(PERL_INC)
 
 if HOST_NEEDS_NO_UNDEFINED
-  PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
+  PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC)
+  PLATFORM_LIBADD = $(PERL_CONF_libperl)
   # The -no-undefined flag is for MS-Windows.  See info node
   # `(gnulib)Libtool and Windows'.  The -L and -l options after it show
   # where to find the undefined symbols.
 else
   PLATFORM_LDFLAGS =
+  PLATFORM_LIBADD =
 endif
 
 AM_LDFLAGS = -avoid-version -module $(PERL_CONF_ccdlflags)
 AM_LDFLAGS += $(PLATFORM_LDFLAGS)
 
-XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la
+MiscXS_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la $(PLATFORM_LIBADD)
+MiscXS_la_LDFLAGS = $(AM_LDFLAGS)
+
+XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la $(PLATFORM_LIBADD)
 XSParagraph_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
 
 
@@ -145,7 +149,7 @@
 
 EXTRA_DIST += $(p)/Parsetexi.xs
 
-Parsetexi_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la
+Parsetexi_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la $(PLATFORM_LIBADD)
 Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
 
 # To locate include files under out-of-source builds.