aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defs/gmake.mk2
-rw-r--r--tool/prereq.status1
2 files changed, 2 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 738c8e33c0..167622739e 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS
+$(Q) \
{ \
$(CHDIR) "$(srcdir)"; \
- sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk template/Makefile.in; \
+ sed -f tool/prereq.status defs/gmake.mk template/Makefile.in; \
sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
} | \
$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
diff --git a/tool/prereq.status b/tool/prereq.status
index e29aec7acb..6de00c8a92 100644
--- a/tool/prereq.status
+++ b/tool/prereq.status
@@ -13,6 +13,7 @@ s,@CP@,cp,g
s,@CPPFLAGS@,,g
s,@CXXFLAGS@,,g
s,@DLDFLAGS@,,g
+s,@DTRACE_EXT@,dmyh,g
s,@EXEEXT@,,g
s,@HAVE_BASERUBY@,yes,g
s,@IFCHANGE@,tool/ifchange,g