From 52ace99f14a9390f5bf71370d616f2ed6b98c034 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Thu, 15 Aug 2013 21:50:13 +0200 Subject: Use File::PATH_SEPARATOR globally instead of ':' On Unix, the path separator is ':', whereas on Windows, it is ';'. This is the first of a series of patch to bring macbrew's and winbrew's codebases closer together. The main places the magic constant ':' was being used were: - the $PATH environment variable - CMAKE-related environment variables - pkg-config related environment variables Closes Homebrew/homebrew#21921. Signed-off-by: Jack Nagel --- Library/Homebrew/python_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/python_helper.rb') diff --git a/Library/Homebrew/python_helper.rb b/Library/Homebrew/python_helper.rb index cb2e5d989..30eddb7c0 100644 --- a/Library/Homebrew/python_helper.rb +++ b/Library/Homebrew/python_helper.rb @@ -62,11 +62,11 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block) # so that lib points to the HOMEBREW_PREFIX/Cellar///lib puts "brew: Prepending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose? mkdir_p py.site_packages - ENV.prepend 'PYTHONPATH', py.site_packages, ':' + ENV.prepend 'PYTHONPATH', py.site_packages, File::PATH_SEPARATOR ENV['PYTHON'] = py.binary - ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':' - ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path - ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx? + ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, File::PATH_SEPARATOR + ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, File::PATH_SEPARATOR if py.pkg_config_path + ENV.prepend 'PATH', py.binary.dirname, File::PATH_SEPARATOR unless py.from_osx? #Note: Don't set LDFLAGS to point to the Python.framework, because # it breaks builds (for example scipy.) -- cgit v1.2.3