From: Glenn Morris <rgm@gnu.org>
Date: Tue, 9 Jun 2015 19:23:47 +0000 (-0400)
Subject: * Makefile.in (SUBDIR_MAKEFILES):
X-Git-Tag: emacs-25.0.90~1818
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/79344156956891ded1ab79c42e8b4bc467366b3b

* Makefile.in (SUBDIR_MAKEFILES):

* lwlib/Makefile.in (WARN_CFLAGS):
Use built-in Make functions rather than echo+sed.
---

diff --git a/Makefile.in b/Makefile.in
index d2948f8413..63e17c3293 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 cbc747cbba..bfeef16571 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@