sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2011-12-13 13:52:35 -08:00
commit eafb8c810b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bindings/python/build.py
View file

@ -41,6 +41,7 @@ def is_py3():
prefix = env['PREFIX'] prefix = env['PREFIX']
target_path = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik') target_path = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik')
target_path_deprecated = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik2')
libraries = ['mapnik','png'] libraries = ['mapnik','png']
@ -152,8 +153,7 @@ if 'install' in COMMAND_LINE_TARGETS:
init_module = env.Install(target_path, init_files) init_module = env.Install(target_path, init_files)
env.Alias(target='install', source=init_module) env.Alias(target='install', source=init_module)
# install mapnik2 module which redirects to mapnik and issues DeprecatedWarning # install mapnik2 module which redirects to mapnik and issues DeprecatedWarning
path = os.path.normpath(env['PYTHON_INSTALL_LOCATION'] + os.path.sep + 'mapnik2') init_mapnik2 = env.Install(target_path_deprecated, 'mapnik2/__init__.py')
init_mapnik2 = env.Install(path, 'mapnik2/__init__.py')
env.Alias(target='install', source=init_mapnik2) env.Alias(target='install', source=init_mapnik2)
# fix perms and install the custom generated 'paths.py' # fix perms and install the custom generated 'paths.py'
@ -204,4 +204,5 @@ if 'uninstall' not in COMMAND_LINE_TARGETS:
env['create_uninstall_target'](env, target_path) env['create_uninstall_target'](env, target_path)
env['create_uninstall_target'](env, target_path_deprecated)