Skip to content

Commit

Permalink
Merge pull request #252 from mapbox/setup-proj-lib
Browse files Browse the repository at this point in the history
Find PROJ data using PROJ_LIB env var.
  • Loading branch information
brendan-ward committed Jan 16, 2015
2 parents 10ce900 + 2eec752 commit 3b8e1c7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,9 @@
except Exception as e:
log.warning("Failed to get options via gdal-config: %s", str(e))

# Conditionally copy PROJ.4 data. Presumes PROJ.4 is installed locally
# with --prefix=/usr/local.
# Conditionally copy PROJ.4 data.
if os.environ.get('PACKAGE_DATA'):
projdatadir = '/usr/local/share/proj'
projdatadir = os.environ.get('PROJ_LIB', '/usr/local/share/proj')
if os.path.exists(projdatadir):
try:
shutil.rmtree('rasterio/proj_data')
Expand Down

0 comments on commit 3b8e1c7

Please sign in to comment.