Ship system_config with bundles again.

This partially reverts commit ac40945ff96f27606ff5d3600cf06b0ba663a5e1.
re-add system_config, but not instant.xml

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 15d7096f2c4fb3b13aa4c119421ab412fa6bd8d6..d4574b07f482b1d2c32671ea82cc27d0ece7b175 100755 (executable)
--- 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 d6b1896617eb701283a9a036f9e30840c44c0dfe..bd94f4580794d08cec7d7cea4fc961e0bc5aff5e 100755 (executable)
--- 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 290c2b49693524eaab3da0b6cd434d60b025d1d2..f5335c3ac87fd5b74ba7a586b5b746920ebde1e5 100755 (executable)
--- 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/