Clean up top-level source tree

Collect architecture independent data in 'share' subfolder.
This also matches the install path

2 files changed, 14 insertions, 14 deletions

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 83e2e3b7ec..ea29b1845b 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -361,13 +361,13 @@ cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries
 
 # MidiMaps
 # got to be careful with names here
-for x in $BUILD_ROOT/../midi_maps/*.map ; do
+for x in $BUILD_ROOT/../share/midi_maps/*.map ; do
     cp "$x" $MidiMaps
 done
 
 # MIDNAM Patch Files
 # got to be careful with names here
-for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
+for x in $BUILD_ROOT/../share/patchfiles/*.midnam ; do
     cp "$x" $PatchFiles
 done
 
@@ -383,13 +383,13 @@ done
 
 # MackieControl data
 # got to be careful with names here
-for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
+for x in $BUILD_ROOT/../share/mcp/*.device $BUILD_ROOT/../share/mcp/*.profile ; do
     cp "$x" $MackieControl
 done
 
 # OSC data
 # got to be careful with names here
-for x in $BUILD_ROOT/../osc/*.preset ; do
+for x in $BUILD_ROOT/../share/osc/*.preset ; do
     cp "$x" $OSC
 done
 
@@ -400,14 +400,14 @@ for x in $BUILD_ROOT/../mixer_settings/*.lua ; do
 done
 
 #Session templates
-cp -av $BUILD_ROOT/../templates $Templates
+cp -av $BUILD_ROOT/../share/templates $Templates
 
 # PluginMetadata
-cp -av $BUILD_ROOT/../plugin_metadata $PluginMetadata
+cp -av $BUILD_ROOT/../share/plugin_metadata $PluginMetadata
 
 # ExportFormats
 # got to be careful with names here
-for x in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
+for x in $BUILD_ROOT/../share/export/*.preset $BUILD_ROOT/../share/export/*.format ; do
     cp "$x" $ExportFormats
 done
 
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index f890cfe971..c01122ac1c 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -347,25 +347,25 @@ for backend in jack wavesaudio dummy coreaudio; do
 done
 
 # Export Formats/Presets
-for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
+for f in $BUILD_ROOT/../share/export/*.preset $BUILD_ROOT/../share/export/*.format ; do
 	cp "$f" $ExportFormats ;
 done
 
 #Session templates
-cp -av $BUILD_ROOT/../templates $Templates
+cp -av $BUILD_ROOT/../share/templates $Templates
 
 # PluginMetadata
-cp -av $BUILD_ROOT/../plugin_metadata $PluginMetadata
+cp -av $BUILD_ROOT/../share/plugin_metadata $PluginMetadata
 
 # MidiMaps
 # got to be careful with names here
-for x in $BUILD_ROOT/../midi_maps/*.map ; do
+for x in $BUILD_ROOT/../share/midi_maps/*.map ; do
 	cp "$x" $MidiMaps
 done
 
 # MIDNAM Patch Files
 # got to be careful with names here
-for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
+for x in $BUILD_ROOT/../share/patchfiles/*.midnam ; do
 	cp "$x" $PatchFiles
 done
 
@@ -381,13 +381,13 @@ done
 
 # MackieControl data
 # got to be careful with names here
-for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
+for x in $BUILD_ROOT/../share/mcp/*.device $BUILD_ROOT/../share/mcp/*.profile ; do
 	cp "$x" $MackieControl
 done
 
 # OSC data
 # got to be careful with names here
-for x in $BUILD_ROOT/../osc/*.preset ; do
+for x in $BUILD_ROOT/../share/osc/*.preset ; do
 	cp "$x" $OSC
 done