From d1f56f5843e45d2b1c2ddc1ce4cd7ad78cad30df Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 21 Dec 2010 21:41:02 +0000 Subject: [PATCH] scons: fixup geos plugin install script --- plugins/input/geos/SConscript | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/input/geos/SConscript b/plugins/input/geos/SConscript index 513373646..a5b89c1c1 100644 --- a/plugins/input/geos/SConscript +++ b/plugins/input/geos/SConscript @@ -25,6 +25,8 @@ Import ('env') prefix = env['PREFIX'] install_prefix = env['DESTDIR'] + '/' + prefix +plugin_env = env.Clone() + geos_src = Split( """ geos_datasource.cpp @@ -41,11 +43,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -input_plugin = env.SharedLibrary('../geos', source=geos_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +input_plugin = plugin_env.SharedLibrary('../geos', source=geos_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) if env['PLATFORM'] == 'Darwin': # if the plugin links to libmapnik2 ensure it is built first Depends(input_plugin,'../../../src/libmapnik2.dylib') -env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) -env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') +if 'uninstall' not in COMMAND_LINE_TARGETS: + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) + env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input')