fix packaging scripts to use new system config file name; NOTE: this file should...

Conflicts:

	tools/linux_packaging/build

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index bfdc247bf23ba30aa3594dda0184e164e89310b7..7d80644ac783026002f49ba6cc139974ff154eb2 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -528,15 +528,16 @@ echo "Copying other stuff to $APPDIR  ..."
 #cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings      $Etc
 cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings  $Etc
 cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
-cp ../../ardour_system.rc $Etc/ardour_system.rc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_light.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_light.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_light_fonts.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_light_styles.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_dark_styles.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_widgets.rc $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_default.conf $Etc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui.conf
+cp ../../system_config $Etc/system_config
+cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/light_fonts.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/dark_fonts.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/light_styles.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/dark_styles.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/widgets.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/ui_default.conf $Etc
+cp $BUILD_ROOT/gtk2_ardour/ui_default.conf $Etc/ardour3_ui.conf
 
 # these are copied straight from the source tree
 

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index cd729ec60e95ecca467f984f175fe67c648cc03f..28ef7a819096ce77e7cfefddb6c7c2f5e0b76218 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -428,12 +428,10 @@ if test x$SAE != x ; then
     cp $BUILD_ROOT/gtk2_ardour/SAE-de-nokeypad.bindings  $Resources
     cp $BUILD_ROOT/gtk2_ardour/SAE-us-keypad.bindings  $Resources
     cp $BUILD_ROOT/gtk2_ardour/SAE-us-nokeypad.bindings  $Resources
-    cp $BUILD_ROOT/ardour_system_sae.rc $Resources/ardour_system.rc
-    echo cp $BUILD_ROOT/ardour_system_sae.rc $Resources/ardour_system.rc
     cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml
     echo cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml
 else
-    cp ../../ardour_system.rc $Resources/ardour_system.rc
+    cp ../../system_config $Resources/system_config
     cp ../../instant.xml $Resources/instant.xml
     echo cp ../../instant.xml $Resources/instant.xml
 fi