diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 11:53:07 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 11:53:07 +0900 |
| commit | df275179bde5eef92b701789b99e88ae038cdae2 (patch) | |
| tree | 2a5767f1bd6ec8d1078ac2b76f68be0ae97d605b /template | |
| parent | 4f938ffa35f5770af73d55e679f9524e032cbfc3 (diff) | |
| download | ruby-df275179bde5eef92b701789b99e88ae038cdae2.tar.gz | |
Revert "Moved aclocal.m4 to macro directory"
This reverts commit 4a6571dbc14ee4e88c12cd9931f7695077a3ee6e,
because chkbuild does not follow.
Diffstat (limited to 'template')
| -rw-r--r-- | template/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/template/Makefile.in b/template/Makefile.in index 51ee854de1..33ea093838 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 $(tooldir)/m4/aclocal.m4 - $(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F) +$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4 + $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) -$(tooldir)/m4/aclocal.m4: +$(srcdir)/aclocal.m4: $(CHDIR) $(srcdir) && \ - type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \ + type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \ touch $(@F) prereq: $(srcdir)/$(CONFIGURE) |