fix packaging scripts to use new system config file name; NOTE: this file should probably be included in Windows packages but appears not to be

Conflicts:

	tools/linux_packaging/build
This commit is contained in:
Paul Davis 2014-09-07 10:23:03 -04:00
parent 9ad3feaba0
commit 6a9cf1e210
2 changed files with 11 additions and 12 deletions

View File

@ -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

View File

@ -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