Do not bundle default system_config (prefer built-in defaults)
Inside the bundle, those files are read-only, anyway. This alleviates us from generating/updating the files with whenever the built-in default changes and also makes architecture dependent default-config (compile time #defines) work.
This commit is contained in:
parent
f484e8a923
commit
ac40945ff9
|
@ -620,8 +620,6 @@ cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
|
|||
|
||||
mkdir ${Shared}/icons
|
||||
mkdir ${Shared}/resources
|
||||
cp ../../system_config $Etc/system_config
|
||||
cp ../../instant.xml $Shared/instant.xml
|
||||
cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
|
||||
cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
|
||||
cp ../../gtk2_ardour/ArdourMono.ttf $Shared
|
||||
|
|
|
@ -472,8 +472,6 @@ cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources
|
|||
|
||||
mkdir ${Resources}/icons
|
||||
mkdir ${Resources}/resources
|
||||
cp ../../system_config $Resources/system_config
|
||||
cp ../../instant.xml $Resources/instant.xml
|
||||
cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/
|
||||
cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/
|
||||
cp ../../gtk2_ardour/ArdourMono.ttf $Shared
|
||||
|
|
|
@ -192,6 +192,9 @@ cp COPYING $DESTDIR/share/
|
|||
cp gtk2_ardour/icons/${PRODUCT_ICON} $DESTDIR/share/
|
||||
cp gtk2_ardour/icons/ardour_bug.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/
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user