From 6d9cd4840d88ce955eae823d1174c2b13d08b50b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 5 Nov 2010 22:24:06 +0000 Subject: * template/ruby.pc.in (arch, sitearch): reordered. * configure.in: keep failed file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 1 - template/ruby.pc.in | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cb4379af2..ccd08d5d5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Nov 6 07:24:01 2010 Nobuyoshi Nakada + + * template/ruby.pc.in (arch, sitearch): reordered. + + * configure.in: keep failed file. + Sat Nov 6 07:03:49 2010 Nobuyoshi Nakada * process.c (rb_fork_err): save errinfo before fdopen. diff --git a/configure.in b/configure.in index 7dd61776b4..c700086a84 100644 --- a/configure.in +++ b/configure.in @@ -2826,7 +2826,6 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in, then mv -f ruby.tmp.pc $ruby_pc else - rm ruby.tmp.pc $ruby_pc exit 1 fi ], diff --git a/template/ruby.pc.in b/template/ruby.pc.in index c2dcaa3eb4..2189667c5e 100644 --- a/template/ruby.pc.in +++ b/template/ruby.pc.in @@ -1,3 +1,5 @@ +arch=@arch@ +sitearch=@sitearch@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ @@ -25,8 +27,6 @@ ruby=${bindir}/${RUBY_INSTALL_NAME}@EXEEXT@ rubyhdrdir=@rubyhdrdir@ vendorhdrdir=@vendorhdrdir@ sitehdrdir=@sitehdrdir@ -arch=@arch@ -sitearch=@sitearch@ Name: Ruby Description: Object Oriented Script Language -- cgit v1.2.3