aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-05 04:30:04 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-05 09:26:57 +0900
commit4a6571dbc14ee4e88c12cd9931f7695077a3ee6e (patch)
treee45d37f47b478dc196c25d0c9e142d22896c0c8a /template
parent21d0b40de2897ac2e98104cb3d33cd374a4402ee (diff)
downloadruby-4a6571dbc14ee4e88c12cd9931f7695077a3ee6e.tar.gz
Moved aclocal.m4 to macro directory
Diffstat (limited to 'template')
-rw-r--r--template/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/template/Makefile.in b/template/Makefile.in
index 33ea093838..51ee854de1 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -366,12 +366,12 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
set $(SHELL) $($@-args); $(reconfig-exec-$(V))
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
- $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(tooldir)/m4/aclocal.m4
+ $(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F)
-$(srcdir)/aclocal.m4:
+$(tooldir)/m4/aclocal.m4:
$(CHDIR) $(srcdir) && \
- type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
+ type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \
touch $(@F)
prereq: $(srcdir)/$(CONFIGURE)