diff options
| author | Robin Gareus <robin@gareus.org> | 2017-03-02 19:39:35 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-03-02 19:41:09 +0100 |
| commit | 12d99f6f6edf62db4b466be64f668b91c6d91c0b (patch) | |
| tree | f20ec8f89a440a6183936dc98f9a9a80aede57aa /tools | |
| parent | ea4bbcf5296e035682f7758a80a763043fd3f946 (diff) | |
Ship system_config with bundles again.
This partially reverts commit ac40945ff96f27606ff5d3600cf06b0ba663a5e1.
re-add system_config, but not instant.xml
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 1 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 1 | ||||
| -rwxr-xr-x | tools/x-win/package.sh | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 15d7096f2c..d4574b07f4 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -620,6 +620,7 @@ cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc mkdir ${Shared}/icons mkdir ${Shared}/resources +cp ../../system_config $Etc/system_config cp ../../gtk2_ardour/icons/*.png ${Shared}/icons cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/ cp ../../gtk2_ardour/ArdourMono.ttf $Shared diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index d6b1896617..bd94f45807 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -472,6 +472,7 @@ cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources mkdir ${Resources}/icons mkdir ${Resources}/resources +cp ../../system_config $Resources/system_config cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/ cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/ cp ../../gtk2_ardour/ArdourMono.ttf $Shared diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 290c2b4969..f5335c3ac8 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -192,9 +192,6 @@ cp COPYING $DESTDIR/share/ cp gtk2_ardour/icons/${PRODUCT_ICON} $DESTDIR/share/ cp gtk2_ardour/icons/ArdourBug.ico $DESTDIR/share/ -#prefer built-in defaults -rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/system_config - # replace default cursor with square version (sans hotspot file) cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/ |