standardize on '$(foo:a=b)' pattern substitution

GNU Make supports both this syntax and `patsubst` for pattern substitution. The
former is more portable to other Make implementations, so use this in preference
to the latter.

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index c8a0cf8ce49d9d44c0c03e4e0b59eb59262a05e7..657208a602c5fb094663c8e77d1661f197f69e2d 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/pathplan \
         -I$(top_srcdir)/cmd/smyrna/gui \
-        $(patsubst -I%,-isystem%,$(GTK_CFLAGS)) \
+        $(GTK_CFLAGS:-I%=-isystem%) \
        $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS) $(XRENDER_CFLAGS)
 
 bin_PROGRAMS =

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index f3cf103f45ea967c88366de56873fa56f8238ae8..b08395237a6bfd51bd95745c6ed4d4eea408d805 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -193,7 +193,7 @@ nodist_libgv_php_la_SOURCES = gv_php.cpp php_gv.h
 libgv_php_la_SOURCES = $(BASESOURCES) gv_php_init.c
 libgv_php_la_LIBADD = $(BASELIBS) $(PHP_LIBS)
 libgv_php_la_LDFLAGS = -module -avoid-version
-libgv_php_la_CPPFLAGS = $(BASECPPFLAGS) $(patsubst -I%,-isystem%,$(PHP_INCLUDES))
+libgv_php_la_CPPFLAGS = $(BASECPPFLAGS) $(PHP_INCLUDES:-I%=-isystem%)
 libgv_php_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-unused-label -Wno-unused-parameter
 gv.php: gv_php.cpp
 php_gv.h: gv_php.cpp