From 9142a1a0378e7bf4d197fc4bd9c15c85147348ab Mon Sep 17 00:00:00 2001 From: Kazuki Sakamoto Date: Wed, 21 Jan 2009 20:46:02 +0900 Subject: [PATCH] change prefix to '/data/ruby' --- lib/ruby-1.9.1-rc1/.ext/include/arm-linux/ruby/config.h | 16 ++++++++-------- lib/ruby-1.9.1-rc1/config.sh | 2 +- lib/ruby-1.9.1-rc1/rbconfig.rb | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/ruby-1.9.1-rc1/.ext/include/arm-linux/ruby/config.h b/lib/ruby-1.9.1-rc1/.ext/include/arm-linux/ruby/config.h index 8ff3088..f5c7d52 100644 --- a/lib/ruby-1.9.1-rc1/.ext/include/arm-linux/ruby/config.h +++ b/lib/ruby-1.9.1-rc1/.ext/include/arm-linux/ruby/config.h @@ -171,12 +171,12 @@ #define USE_ELF 1 #define DLEXT_MAXLEN 3 #define DLEXT ".so" -#define RUBY_LIB "/usr/local/lib/ruby/1.9.1" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/site_ruby" -#define RUBY_SITE_LIB2 "/usr/local/lib/ruby/site_ruby/1.9.1" -#define RUBY_VENDOR_LIB "/usr/local/lib/ruby/vendor_ruby" -#define RUBY_VENDOR_LIB2 "/usr/local/lib/ruby/vendor_ruby/1.9.1" +#define RUBY_LIB "/data/ruby/lib/ruby/1.9.1" +#define RUBY_SITE_LIB "/data/ruby/lib/ruby/site_ruby" +#define RUBY_SITE_LIB2 "/data/ruby/lib/ruby/site_ruby/1.9.1" +#define RUBY_VENDOR_LIB "/data/ruby/lib/ruby/vendor_ruby" +#define RUBY_VENDOR_LIB2 "/data/ruby/lib/ruby/vendor_ruby/1.9.1" #define RUBY_PLATFORM "arm-linux" -#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.9.1/arm-linux" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/site_ruby/1.9.1/arm-linux" -#define RUBY_VENDOR_ARCHLIB "/usr/local/lib/ruby/vendor_ruby/1.9.1/arm-linux" +#define RUBY_ARCHLIB "/data/ruby/lib/ruby/1.9.1/arm-linux" +#define RUBY_SITE_ARCHLIB "/data/ruby/lib/ruby/site_ruby/1.9.1/arm-linux" +#define RUBY_VENDOR_ARCHLIB "/data/ruby/lib/ruby/vendor_ruby/1.9.1/arm-linux" diff --git a/lib/ruby-1.9.1-rc1/config.sh b/lib/ruby-1.9.1-rc1/config.sh index 6b256ca..7f2a073 100755 --- a/lib/ruby-1.9.1-rc1/config.sh +++ b/lib/ruby-1.9.1-rc1/config.sh @@ -26,4 +26,4 @@ export ac_cv_func_vsnprintf=yes export ac_cv_func_isinf=yes export ac_cv_header_langinfo_h=no -./configure --build=${RUBYARCH} --target=${RUBYARCH} --host=${GCCHOST} --with-static-linked-ext --enable-wide-getaddrinfo +./configure --build=${RUBYARCH} --target=${RUBYARCH} --host=${GCCHOST} --with-static-linked-ext --enable-wide-getaddrinfo --prefix=/data/ruby diff --git a/lib/ruby-1.9.1-rc1/rbconfig.rb b/lib/ruby-1.9.1-rc1/rbconfig.rb index 7508ddf..761c355 100644 --- a/lib/ruby-1.9.1-rc1/rbconfig.rb +++ b/lib/ruby-1.9.1-rc1/rbconfig.rb @@ -12,7 +12,7 @@ module RbConfig CONFIG["DESTDIR"] = DESTDIR CONFIG["INSTALL"] = '/usr/bin/install -c' CONFIG["EXEEXT"] = "" - CONFIG["prefix"] = (TOPDIR || DESTDIR + "/usr/local") + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/data/ruby") CONFIG["ruby_install_name"] = "ruby" CONFIG["RUBY_INSTALL_NAME"] = "ruby" CONFIG["RUBY_SO_NAME"] = "ruby" @@ -22,7 +22,7 @@ module RbConfig CONFIG["vendorhdrdir"] = "$(rubyhdrdir)/vendor_ruby" CONFIG["sitehdrdir"] = "$(rubyhdrdir)/site_ruby" CONFIG["rubyhdrdir"] = "$(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)" - CONFIG["configure_args"] = " '--build=arm-android-linux' '--target=arm-android-linux' '--host=i686-linux' '--with-static-linked-ext' '--enable-wide-getaddrinfo' 'build_alias=arm-android-linux' 'host_alias=i686-linux' 'target_alias=arm-android-linux' 'CC=/home/sakamoto/android/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gcc' 'LIBS=-nostdlib -L/home/sakamoto/android/out/target/product/dream/obj/lib /home/sakamoto/android/out/target/product/dream/obj/lib/crtbegin_dynamic.o -lstdc++ -lc -lm -ldl /home/sakamoto/android/out/target/product/dream/obj/lib/crtend_android.o -Wl,-dynamic-linker,/system/bin/linker,-rpath,/system/lib' 'CPPFLAGS=-nostdinc -I/home/sakamoto/android/external/zlib -I/home/sakamoto/android/external/openssl/include -I/home/sakamoto/android/bionic/libc/include -I/home/sakamoto/android/bionic/libc/arch-arm/include -I/home/sakamoto/android/bionic/libc/kernel/common -I/home/sakamoto/android/bionic/libc/kernel/arch-arm -I/home/sakamoto/android/bionic/libc/kernel/common/linux -I/home/sakamoto/android/bionic/libm/include -I/home/sakamoto/android/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/lib/gcc/arm-eabi/4.2.1/include -Dptrdiff_t=__ptrdiff_t -include stdio.h -include unistd.h -include fcntl.h -include sys/mman.h -DHAVE_GETCWD'" + CONFIG["configure_args"] = " '--build=arm-android-linux' '--target=arm-android-linux' '--host=i686-linux' '--with-static-linked-ext' '--enable-wide-getaddrinfo' '--prefix=/data/ruby' 'build_alias=arm-android-linux' 'host_alias=i686-linux' 'target_alias=arm-android-linux' 'CC=/home/sakamoto/android/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gcc' 'LIBS=-nostdlib -L/home/sakamoto/android/out/target/product/dream/obj/lib /home/sakamoto/android/out/target/product/dream/obj/lib/crtbegin_dynamic.o -lstdc++ -lc -lm -ldl /home/sakamoto/android/out/target/product/dream/obj/lib/crtend_android.o -Wl,-dynamic-linker,/system/bin/linker,-rpath,/system/lib' 'CPPFLAGS=-nostdinc -I/home/sakamoto/android/external/zlib -I/home/sakamoto/android/external/openssl/include -I/home/sakamoto/android/bionic/libc/include -I/home/sakamoto/android/bionic/libc/arch-arm/include -I/home/sakamoto/android/bionic/libc/kernel/common -I/home/sakamoto/android/bionic/libc/kernel/arch-arm -I/home/sakamoto/android/bionic/libc/kernel/common/linux -I/home/sakamoto/android/bionic/libm/include -I/home/sakamoto/android/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/lib/gcc/arm-eabi/4.2.1/include -Dptrdiff_t=__ptrdiff_t -include stdio.h -include unistd.h -include fcntl.h -include sys/mman.h -DHAVE_GETCWD'" CONFIG["vendordir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby" CONFIG["sitedir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/site_ruby" CONFIG["ruby_version"] = "1.9.1" -- 2.11.0