From 1c7cb97d852ff20fc0483f97020c07f82d8cc617 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 29 Sep 2011 23:24:55 +0000 Subject: [PATCH] Fix installation globs git-svn-id: svn://localhost/ardour2/branches/3.0@10168 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/wscript | 6 +++--- libs/audiographer/wscript | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index eb5e61712c..0bde5477e0 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -599,8 +599,8 @@ def build(bld): 'step_editing.bindings') # Icons/Images - bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png') - bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm') + bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png')) + bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm')) bld.install_files('${DATADIR}/ardour3', 'splash.png') # Default UI configuration @@ -609,7 +609,7 @@ def build(bld): bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_widgets.rc') # Default export stuff - bld.install_files('${SYSCONFDIR}/ardour3/export', 'export/*.format') + bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format')) # i18n if bld.env['ENABLE_NLS']: diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index de22a73a37..172f3b13b7 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -44,10 +44,10 @@ def configure(conf): def build(bld): # Headers - #bld.install_files('${INCLUDEDIR}/audiographer', 'audiographer/*.h') - #bld.install_files('${INCLUDEDIR}/audiographer/general', 'audiographer/general/*.h') - #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', 'audiographer/sndfile/*.h') - #bld.install_files('${INCLUDEDIR}/audiographer/utils', 'audiographer/utils/*.h') + #bld.install_files('${INCLUDEDIR}/audiographer', bld.path.ant_glob('audiographer/*.h')) + #bld.install_files('${INCLUDEDIR}/audiographer/general', bld.path.ant_glob('audiographer/general/*.h')) + #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', bld.path.ant_glob('audiographer/sndfile/*.h')) + #bld.install_files('${INCLUDEDIR}/audiographer/utils', bld.path.ant_glob('audiographer/utils/*.h')) #bld.env['BUILD_TESTS'] = True bld.env['HAVE_ALL_GTHREAD'] = (bld.is_defined('HAVE_GLIB') -- 2.30.2