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

ruby-changes:37939

From: nobu <ko1@a...>
Date: Thu, 19 Mar 2015 11:04:42 +0900 (JST)
Subject: [ruby-changes:37939] nobu:r50020 (trunk): Makefile.in: CONFIGURE

nobu	2015-03-19 11:04:31 +0900 (Thu, 19 Mar 2015)

  New Revision: 50020

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50020

  Log:
    Makefile.in: CONFIGURE
    
    * Makefile.in (CONFIGURE): make configure script name selectable.

  Modified files:
    trunk/Makefile.in
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 50019)
+++ configure.in	(revision 50020)
@@ -4104,6 +4104,7 @@ AC_SUBST(vendordir)dnl https://github.com/ruby/ruby/blob/trunk/configure.in#L4104
 AC_SUBST(vendorlibdir)dnl
 AC_SUBST(vendorarchdir)dnl
 
+AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
 AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
 
 if test "${universal_binary-no}" = yes ; then
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 50019)
+++ Makefile.in	(revision 50020)
@@ -22,6 +22,7 @@ LD = @LD@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L22
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
+CONFIGURE = @CONFIGURE@
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
@@ -298,8 +299,8 @@ reconfig config.status:	$(srcdir)/config https://github.com/ruby/ruby/blob/trunk/Makefile.in#L299
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/configure: $(srcdir)/configure.in
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF)
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
 incs: id.h
 all-incs: probes.h

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

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