mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Pass MAKE value to configure for non-default name case
GNU make does not export it by default.
This commit is contained in:
parent
f169931414
commit
3fa4fd4780
2 changed files with 2 additions and 1 deletions
|
@ -4079,7 +4079,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
|
||||||
echo 'ruby: $(PROGRAM);' >> $tmpmk
|
echo 'ruby: $(PROGRAM);' >> $tmpmk
|
||||||
test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
|
test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
|
||||||
]) && mv -f $tmpmk Makefile],
|
]) && mv -f $tmpmk Makefile],
|
||||||
[EXEEXT='$EXEEXT' gnumake='$gnumake' GIT='$GIT'])
|
[EXEEXT='$EXEEXT' MAKE='$MAKE' gnumake='$gnumake' GIT='$GIT'])
|
||||||
|
|
||||||
AC_ARG_WITH([ruby-pc],
|
AC_ARG_WITH([ruby-pc],
|
||||||
AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
|
AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
|
# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
|
||||||
|
|
||||||
|
reconfig config.status: export MAKE:=$(MAKE)
|
||||||
override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
|
override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
|
||||||
override mflags := $(filter-out -j%,$(MFLAGS))
|
override mflags := $(filter-out -j%,$(MFLAGS))
|
||||||
MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
|
MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
|
||||||
|
|
Loading…
Reference in a new issue