--- ./gettext-runtime/gnulib-lib/Makefile.am	2015-12-28 00:08:04.000000000 +0100
+++ ./gettext-runtime/gnulib-lib/Makefile.am	2018-01-22 15:00:11.094543229 +0100
@@ -39,7 +39,7 @@
 MAINTAINERCLEANFILES =
 
 AM_CPPFLAGS =
-AM_CFLAGS =
+AM_CFLAGS = $(DEFAULT_CFLAGS_SRC)
 
 noinst_LIBRARIES += libgrt.a
 
--- ./gettext-runtime/src/Makefile.am	2015-06-05 23:52:52.000000000 +0200
+++ ./gettext-runtime/src/Makefile.am	2018-01-22 15:00:11.098543277 +0100
@@ -43,14 +43,17 @@
 # Need @LTLIBICONV@ because striconv.c uses iconv().
 LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ $(WOE32_LDADD)
 
+envsubst_CFLAGS = $(DEFAULT_CFLAGS_SRC)
+envsubst_LDFLAGS = $(DEFAULT_LDFLAGS_APPL)
+
 # Specify installation directory, for --enable-relocatable.
 gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
 ngettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
-envsubst_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
+envsubst_CFLAGS += -DINSTALLDIR=\"$(bindir)\"
 if RELOCATABLE_VIA_LD
 gettext_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
 ngettext_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
-envsubst_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
+envsubst_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif
 
 # For installing gettext.sh in $(bindir).