From 663eefcb6fad1c2384a4675c0a665390c6380133 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 19 Mar 2015 02:04:31 +0000 Subject: [PATCH] Makefile.in: CONFIGURE * Makefile.in (CONFIGURE): make configure script name selectable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 5 +++-- configure.in | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index d5b1279022..6983dd1008 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,7 @@ LD = @LD@ YACC = bison PURIFY = AUTOCONF = autoconf +CONFIGURE = @CONFIGURE@ @SET_MAKE@ MKFILES = @MAKEFILES@ BASERUBY = @BASERUBY@ @@ -298,8 +299,8 @@ reconfig config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in \ @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 diff --git a/configure.in b/configure.in index e278261c6f..21ea2f70fd 100644 --- a/configure.in +++ b/configure.in @@ -4104,6 +4104,7 @@ AC_SUBST(vendordir)dnl 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