From 6c56eb646b9c00f4c38c56717d0f5419f1b0d07b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 10 Oct 2006 02:36:18 +0000 Subject: [PATCH] do not include install targets for conditionally-built subdirs git-svn-id: svn://localhost/ardour2/trunk@969 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/appleutility/SConscript | 3 +-- vst/SConscript | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/appleutility/SConscript b/libs/appleutility/SConscript index 695b2315cb..c8bab03a87 100644 --- a/libs/appleutility/SConscript +++ b/libs/appleutility/SConscript @@ -17,7 +17,6 @@ appleutility.Append(LINKFLAGS='-framework CoreServices') libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files) if appleutility['COREAUDIO']: Default(libappleutility) - -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libappleutility)) + env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libappleutility)) env.Alias('tarball', env.Distribute (env['DISTTREE'], ['SConscript'] + appleutility_files + glob.glob('*.h') )) diff --git a/vst/SConscript b/vst/SConscript index 6736fe2c0e..988a386de3 100644 --- a/vst/SConscript +++ b/vst/SConscript @@ -71,10 +71,10 @@ if ardour_vst['VST']: ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (Chmod (wine_executable, 0755))) Default([wine_generated_executable, wine_executable]) -# the wine script - into the bin dir -env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable)) -# the win32 executable - into the lib dir since the wine script will look for it there -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), 'ardour_vst.exe.so')) + # the wine script - into the bin dir + env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable)) + # the win32 executable - into the lib dir since the wine script will look for it there + env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), 'ardour_vst.exe.so')) env.Alias ('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript',