summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 21:19:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 21:19:46 +0000
commiteaed6d188030176d3064d00e8624c9d900818396 (patch)
treeaef9b494dff904817cc76a91fe483368ddeabc80
parent54aadf55564ffeea8ac85c4179e262a363073e3f (diff)
* common.mk (revision.h.tmp): use double quotes for Windows.
[ruby-core:30270] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf872e2d81..3e57359917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 17 06:19:45 2010 Nobuyoshi Nakada <[email protected]>
+
+ * common.mk (revision.h.tmp): use double quotes for Windows.
+ [ruby-core:30270]
+
Mon May 17 00:43:47 2010 Nobuyoshi Nakada <[email protected]>
* version.c (ruby_description): RUBY_REVISION_STR may be empty.
diff --git a/common.mk b/common.mk
index 9b431f40d3..10e22e7727 100644
--- a/common.mk
+++ b/common.mk
@@ -491,7 +491,9 @@ revision.h.tmp: $(REVISION_FORCE)
@set LC_ALL=C
-@($(CHDIR) "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \
sed -n \
- -e '/^URL:/{' -e '/\/trunk$$/d' -e "s!.*/\([^/][^/]*\)$$"'!#define RUBY_BRANCH_NAME "\1"!p' -e '}' \
+ -e "/^URL:/{" \
+ -e "/\/trunk$$/!s|.*/\([^/][^/]*\)$$|#define RUBY_BRANCH_NAME \"\1\"|p" \
+ -e "}" \
-e "s/.*Rev:/#define RUBY_REVISION/p") > "$@"
-IF-NO-STRING-LITERAL-CONCATENATION-::
@{ \