diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-22 22:52:05 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-22 22:52:05 +0000 |
| commit | 4725c9880d162868cfb569f87ad73aa9ab7d1787 (patch) | |
| tree | eabb8278ee6ad88a99de9ef2f7490be73148f000 /configure.in | |
| parent | 2b84626193c43ba49f2f4663aad76810684bd45c (diff) | |
Revert "* configure.in (Makefile): get rid of confliction with -j."
This reverts commit r35104 because it breaks build on FreeBSD.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 4cbff72251..103b0f5b11 100644 --- a/configure.in +++ b/configure.in @@ -3075,10 +3075,12 @@ AC_CONFIG_FILES(Makefile, [{ else echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk' fi + } > confmk$$.tmp && mv -f confmk$$.tmp Makefile && + { grep '^ruby:' Makefile > /dev/null || ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null || - echo 'ruby: $(PROGRAM);' - } > confmk$$.tmp && mv -f confmk$$.tmp Makefile], + echo 'ruby: $(PROGRAM);' >> Makefile + }], [EXEEXT='$EXEEXT' gnumake='$gnumake']) AC_ARG_WITH([ruby-pc], |