aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-09 19:54:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-09 19:54:10 +0000
commit5c5329418985b57d32c3ee06af3f646fc8d394f8 (patch)
treecd5fa88ec6125a74720694e1d9c4b9b5af9b65f2
parent3a60f6efdc418cba77d9c6fd2331576701ca2ec0 (diff)
downloadruby-5c5329418985b57d32c3ee06af3f646fc8d394f8.tar.gz
* configure.in (Makefile): info-program needs common.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 796f59aec3..c59d7020f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 10 04:54:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (Makefile): info-program needs common.mk.
+
Fri Apr 10 03:46:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_INSTALL_NAME): use --program-transform-name.
diff --git a/configure.in b/configure.in
index 2752419e22..ba640992be 100644
--- a/configure.in
+++ b/configure.in
@@ -2508,14 +2508,15 @@ AC_CONFIG_FILES(Makefile, [{
fi
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
- ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null || echo 'ruby: $(PROGRAM)'
if test "$gnumake" != yes; then
echo ['$(MKFILES): $(srcdir)/common.mk']
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
else
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi
- } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
+ } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+ ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
+ echo 'ruby: $(PROGRAM)' >> Makefile],
[EXEEXT=$EXEEXT gnumake=$gnumake])
AC_OUTPUT
dnl }