ruby-changes:15473
From: nobu <ko1@a...>
Date: Sat, 17 Apr 2010 08:35:28 +0900 (JST)
Subject: [ruby-changes:15473] Ruby:r27373 (ruby_1_8): * Makefile.in, configure.in, common.mk, */Makefile.sub (CHDIR): cd
nobu 2010-04-17 08:35:16 +0900 (Sat, 17 Apr 2010) New Revision: 27373 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27373 Log: * Makefile.in, configure.in, common.mk, */Makefile.sub (CHDIR): cd using phisical directory. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/Makefile.in branches/ruby_1_8/bcc32/Makefile.sub branches/ruby_1_8/common.mk branches/ruby_1_8/configure.in branches/ruby_1_8/win32/Makefile.sub Index: ruby_1_8/Makefile.in =================================================================== --- ruby_1_8/Makefile.in (revision 27372) +++ ruby_1_8/Makefile.in (revision 27373) @@ -1,6 +1,7 @@ SHELL = /bin/sh NULLCMD = : RUNCMD = $(SHELL) +CHDIR = @CHDIR@ #### Start of system configuration section. #### @@ -151,7 +152,7 @@ exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3` $(srcdir)/configure: $(srcdir)/configure.in - unset PWD; cd $(srcdir) && exec $(AUTOCONF) + $(CHDIR) $(srcdir) && exec $(AUTOCONF) lex.c: keywords ( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \ Index: ruby_1_8/configure.in =================================================================== --- ruby_1_8/configure.in (revision 27372) +++ ruby_1_8/configure.in (revision 27373) @@ -258,6 +258,23 @@ fi AC_SUBST(MAKEDIRS) +AC_MSG_CHECKING([for cd using phisical directory]) +rm -fr conf$$.dir +mkdir conf$$.dir && +(cd conf$$.dir && mkdir src build && cd src && +$as_ln_s ../build . > /dev/null 2>&1 && cd build && +for chdir in 'cd -P' 'PWD= cd'; do + /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break +done) +if test -e conf$$.dir/src/cdcmd; then + read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null +else + CHDIR=cd +fi +rm -fr conf$$.dir +AC_MSG_RESULT([$CHDIR]) +AC_SUBST(CHDIR) + dnl check for large file stuff mv confdefs.h confdefs1.h : > confdefs.h Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 27372) +++ ruby_1_8/ChangeLog (revision 27373) @@ -1,3 +1,8 @@ +Sat Apr 17 08:35:14 2010 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in, configure.in, common.mk, */Makefile.sub (CHDIR): cd + using phisical directory. + Sat Apr 17 07:02:37 2010 Nobuyoshi Nakada <nobu@r...> * test/ruby/test_thread.rb (TestThreadGroup#test_uninitialized): Index: ruby_1_8/bcc32/Makefile.sub =================================================================== --- ruby_1_8/bcc32/Makefile.sub (revision 27372) +++ ruby_1_8/bcc32/Makefile.sub (revision 27373) @@ -2,6 +2,7 @@ SHELL = $(COMSPEC) MKFILES = Makefile +CHDIR = cd #### Start of system configuration section. #### !ifndef OS Index: ruby_1_8/common.mk =================================================================== --- ruby_1_8/common.mk (revision 27372) +++ ruby_1_8/common.mk (revision 27373) @@ -496,7 +496,7 @@ revision.h.tmp: $(REVISION_FORCE) @set LC_MESSAGES=C - -@{ cd "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \ + -@{ $(CHDIR) "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \ sed -n \ -e '/^URL:/{' -e '/\/trunk$$/d' -e 's!.*/\([^/][^/]*\)$$!#define RUBY_BRANCH_NAME "\1"!p' -e '}' \ -e "s/.*Rev:/#define RUBY_REVISION/p"; } > "$@" Index: ruby_1_8/win32/Makefile.sub =================================================================== --- ruby_1_8/win32/Makefile.sub (revision 27372) +++ ruby_1_8/win32/Makefile.sub (revision 27373) @@ -4,6 +4,7 @@ RUNCMD = $(COMSPEC) /c MKFILES = Makefile NULL = nul +CHDIR = cd !ifndef MFLAGS MFLAGS=-l -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/