move mapnik-config back to utils/

.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

SConstruct

@@ -2022,8 +2022,8 @@ if not HELP_REQUESTED:
     if env['BENCHMARK']:
         SConscript('benchmark/build.py')
 
-    # install pkg-config script and mapnik-config script
+    # install mapnik-config script
-    SConscript('bin/build.py')
+    SConscript('utils/mapnik-config/build.py')
 
     # write the viewer.ini file
     SConscript('demo/viewer/build.py')

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