[前][次][番号順一覧][スレッド一覧]

ruby-changes:65478

From: Nobuyoshi <ko1@a...>
Date: Sat, 20 Mar 2021 09:12:38 +0900 (JST)
Subject: [ruby-changes:65478] 4ea9df0135 (master): No longer aclocal is used [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=4ea9df0135

From 4ea9df0135d92706c556a58a4f6eb43ee4d08594 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 20 Mar 2021 09:12:08 +0900
Subject: No longer aclocal is used [ci skip]

---
 LEGAL                | 11 -----------
 template/Makefile.in |  8 +-------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/LEGAL b/LEGAL
index 2a7964e..177dcf6 100644
--- a/LEGAL
+++ b/LEGAL
@@ -314,17 +314,6 @@ mentioned below. https://github.com/ruby/ruby/blob/trunk/LEGAL#L314
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-[aclocal.m4]
-
-  This file is free software.
-
-  >>>
-    Copyright (C) 1996-2020:: Free Software Foundation, Inc.
-
-    This file is free software; the Free Software Foundation
-    gives unlimited permission to copy and/or distribute it,
-    with or without modifications, as long as this notice is preserved.
-
 [tool/config.guess]
 [tool/config.sub]
 
diff --git a/template/Makefile.in b/template/Makefile.in
index a1fd241..fae425d 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -30,7 +30,6 @@ LD = @LD@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L30
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
-ACLOCAL = aclocal
 CONFIGURE = @CONFIGURE@
 @SET_MAKE@
 MKFILES = @MAKEFILES@
@@ -369,14 +368,9 @@ reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L368
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac
 	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
-$(srcdir)/aclocal.m4:
-	$(CHDIR) $(srcdir) && \
-	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
-	touch $(@F)
-
 prereq: $(srcdir)/$(CONFIGURE)
 
 incs: id.h
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]