diff --git a/.gitignore b/.gitignore index 40e4585b5..3fd4e4bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ demo/viewer/viewer.ini tests/cpp_tests/font_registration_test tests/python_tests/raster_colorizer_test.png tests/python_tests/raster_colorizer_test_save.xml -bin/mapnik-config +utils/mapnik-config/mapnik-config utils/shapeindex/shapeindex utils/ogrindex/ogrindex utils/pgsql2sqlite/pgsql2sqlite diff --git a/SConstruct b/SConstruct index 887826ca1..1248b0184 100644 --- a/SConstruct +++ b/SConstruct @@ -2022,8 +2022,8 @@ if not HELP_REQUESTED: if env['BENCHMARK']: SConscript('benchmark/build.py') - # install pkg-config script and mapnik-config script - SConscript('bin/build.py') + # install mapnik-config script + SConscript('utils/mapnik-config/build.py') # write the viewer.ini file SConscript('demo/viewer/build.py') diff --git a/bin/build.py b/utils/mapnik-config/build.py similarity index 98% rename from bin/build.py rename to utils/mapnik-config/build.py index 26e28c2d7..a4fa89f09 100644 --- a/bin/build.py +++ b/utils/mapnik-config/build.py @@ -144,7 +144,7 @@ write_config(configuration,template,config_file) target_path = os.path.normpath(os.path.join(config_env['INSTALL_PREFIX'],'bin')) full_target = os.path.join(target_path,config_file) -Depends(full_target, env.subst('../src/%s' % env['MAPNIK_LIB_NAME'])) +Depends(full_target, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) if 'install' in COMMAND_LINE_TARGETS: # we must add 'install' catch here because otherwise diff --git a/bin/mapnik-config.template.sh b/utils/mapnik-config/mapnik-config.template.sh similarity index 100% rename from bin/mapnik-config.template.sh rename to utils/mapnik-config/mapnik-config.template.sh