python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-05 04:50:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
David McKeone 2014-01-01 15:43:10 -07:00
commit a8c1db8eda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -214,7 +214,7 @@ class pil_build_ext(build_ext):
_add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include')) _add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include'))
except: except:
pass # homebrew not installed pass # homebrew not installed
# freetype2 ships with X11 (after homebrew, so that homebrew freetype is prefered) # freetype2 ships with X11 (after homebrew, so that homebrew freetype is prefered)
_add_directory(library_dirs, "/usr/X11/lib") _add_directory(library_dirs, "/usr/X11/lib")
_add_directory(include_dirs, "/usr/X11/include") _add_directory(include_dirs, "/usr/X11/include")