summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-29 12:05:44 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-29 12:05:44 +0000
commit88fbd108a2afa59c1f7aa542745a582073d92e63 (patch)
treeb8569be506067964abe3e692d0a2cbd674bb2265
parentf090f8aef5363e522aade1c58f2c6c39cdb3c409 (diff)
merge revision(s) 35589: [Backport #8406]
* configure.in (POSTLINK): default to : command to get rid of flag only command, since BSD make does not work with it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--version.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ec2cd761c..2bd65dc756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 29 21:03:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (POSTLINK): default to : command to get rid of flag
+ only command, since BSD make does not work with it.
+
Wed May 29 20:59:38 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/yaml.rb: documentation updates, patched by zzak.
diff --git a/configure.in b/configure.in
index b734e47d09..7453c9165b 100644
--- a/configure.in
+++ b/configure.in
@@ -955,6 +955,8 @@ AC_ARG_ENABLE(pthread,
dnl Checks for libraries.
AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+POSTLINK=:
+AC_SUBST(POSTLINK)
AS_CASE(["$target_os"],
[solaris*], [
AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
diff --git a/version.h b/version.h
index 6da0e2aab6..fe1ccedbd7 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 431
+#define RUBY_PATCHLEVEL 432
#define RUBY_RELEASE_DATE "2013-05-29"
#define RUBY_RELEASE_YEAR 2013