Blob Blame History Raw
diff -up MuseScore-2.0.0/share/sound/CMakeLists.txt.default-soundfont MuseScore-2.0.0/share/sound/CMakeLists.txt
--- MuseScore-2.0.0/share/sound/CMakeLists.txt.default-soundfont	2015-04-06 13:32:11.466423303 -0400
+++ MuseScore-2.0.0/share/sound/CMakeLists.txt	2015-04-06 13:32:30.018306527 -0400
@@ -21,6 +21,6 @@
 install(FILES
       FluidR3Mono_GM.sf3
       FluidR3Mono_License.md
-      DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound
+      DESTINATION ${Mscore_SHARE_NAME}/soundfonts
       )
 
diff -up MuseScore-2.0.0/mscore/preferences.cpp.default-soundfont MuseScore-2.0.0/mscore/preferences.cpp
--- MuseScore-2.0.0/mscore/preferences.cpp.default-soundfont	2015-04-24 08:16:52.335553264 -0400
+++ MuseScore-2.0.0/mscore/preferences.cpp	2015-04-24 08:19:06.440445087 -0400
@@ -200,7 +200,7 @@ void Preferences::init()
       myImagesPath    = QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("images_directory",     "Images"))).absoluteFilePath();
       myTemplatesPath = QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("templates_directory",  "Templates"))).absoluteFilePath();
       myPluginsPath   = QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("plugins_directory",    "Plugins"))).absoluteFilePath();
-      sfPath          = QString("%1;%2").arg(QFileInfo(QString("%1%2").arg(mscoreGlobalShare).arg("sound")).absoluteFilePath()).arg(QFileInfo(QString("%2/%3").arg(wd).arg(QCoreApplication::translate("soundfonts_directory", "Soundfonts"))).absoluteFilePath());
+      sfPath          = QString("%1;%2").arg(QFileInfo(QString("%1%2").arg("/usr/share/").arg("soundfonts")).absoluteFilePath()).arg(QFileInfo(QString("%2/%3").arg(wd).arg(QCoreApplication::translate("soundfonts_directory", "Soundfonts"))).absoluteFilePath());
 
       MScore::setNudgeStep(.1);         // cursor key (default 0.1)
       MScore::setNudgeStep10(1.0);      // Ctrl + cursor key (default 1.0)