[前][次][番号順一覧][スレッド一覧]

ruby-changes:36449

From: naruse <ko1@a...>
Date: Fri, 21 Nov 2014 19:35:03 +0900 (JST)
Subject: [ruby-changes:36449] naruse:r48530 (trunk): * common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.

naruse	2014-11-21 19:34:55 +0900 (Fri, 21 Nov 2014)

  New Revision: 48530

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48530

  Log:
    * common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
    
    * common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
      $(MAKEDIR) for Windows.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48529)
+++ ChangeLog	(revision 48530)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Nov 21 19:32:57 2014  NARUSE, Yui  <naruse@r...>
+
+	* common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
+
+	* common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
+	  $(MAKEDIR) for Windows.
+
 Fri Nov 21 18:12:37 2014  Tanaka Akira  <akr@f...>
 
 	* tool/update-deps: Refactored.
Index: common.mk
===================================================================
--- common.mk	(revision 48529)
+++ common.mk	(revision 48530)
@@ -808,8 +808,8 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L808
 $(srcdir)/ext/ripper/ripper.c: parse.y id.h
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH=../.. \
-		top_srcdir=../../$(srcdir) srcdir=../../$(srcdir)/ext/ripper \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)$(MAKEDIR)" \
+		top_srcdir=../.. srcdir=. \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]