2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index d2948f84139..63e17c32937 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,7 @@ SUBDIR = $(NTDIR) lib lib-src src lisp
 
 # The subdir makefiles created by config.status.
 SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
-SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
+SUBDIR_MAKEFILES = $(patsubst ${srcdir}/%,%,${SUBDIR_MAKEFILES_IN:.in=})
 
 # Subdirectories to install, and where they'll go.  lib-src's and nt's
 # makefiles know how to install them, so we don't do that here.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index cbc747cbbac..bfeef16571a 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -31,7 +31,8 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
-WARN_CFLAGS = `echo @WARN_CFLAGS@ | sed 's/ -Wwrite-strings//'`
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS := $(filter-out -Wwrite-strings,${WARN_CFLAGS})
 WERROR_CFLAGS = @WERROR_CFLAGS@
 CAIRO_CFLAGS= @CAIRO_CFLAGS@