Kouhei Sutou
null+****@clear*****
Mon Jul 7 23:30:21 JST 2014
Kouhei Sutou 2014-07-07 23:30:21 +0900 (Mon, 07 Jul 2014) New Revision: 5251f657e893ff699b122dbabe414163cc990b15 https://github.com/groonga/heroku-buildpack-groonga/commit/5251f657e893ff699b122dbabe414163cc990b15 Message: Expand environment variable values in env_dir Modified files: bin/compile Modified: bin/compile (+15 -7) =================================================================== --- bin/compile 2014-07-07 23:22:14 +0900 (9e13e44) +++ bin/compile 2014-07-07 23:30:21 +0900 (1e83fce) @@ -66,14 +66,17 @@ Dir.chdir(build_dir) do fix_prefix_in_pc(prefix, absolete_prefix) puts("-----> Creating Groonga database") - ENV["PATH"] = [ + paths = [ "#{absolete_prefix}/bin", ENV["PATH"], - ].join(File::PATH_SEPARATOR) - ENV["LD_LIBRARY_PATH"] = [ - "#{absolete_prefix}/lib", + ] + ENV["PATH"] = paths.compact.join(File::PATH_SEPARATOR) + lib_dir = "#{absolete_prefix}/lib" + ld_library_paths = [ + lib_dir, ENV["LD_LIBRARY_PATH"], - ].join(File::PATH_SEPARATOR) + ] + ENV["LD_LIBRARY_PATH"] = ld_library_paths.compact.join(File::PATH_SEPARATOR) sh("groonga", "-n", database_path, "quit") puts("-----> Loading data") @@ -84,10 +87,15 @@ Dir.chdir(build_dir) do puts("-----> Setting environment variables") open("#{env_dir}/LD_LIBRARY_PATH", "w") do |env_file| - env_file.write("#{absolete_prefix}/lib:$LD_LIBRARY_PATH") + env_file.write(ENV["LD_LIBRARY_PATH"]) end open("#{env_dir}/PKG_CONFIG_PATH", "w") do |env_file| - env_file.write("#{absolete_prefix}/lib/pkgconfig:$PKG_CONFIG_PATH") + pkg_config_paths = [ + "#{lib_dir}/pkgconfig", + ENV["PKG_CONFIG_PATH"] + ] + pkg_config_path = pkg_config_paths.compact.join(File::PATH_SEPARATOR) + env_file.write(pkg_config_path) end app_dir = ENV["HOME"] -------------- next part -------------- HTML����������������������������...下载
