See ChangeLog

5 files changed, 12 insertions, 12 deletions

diff --git a/muse2/synti/CMakeLists.txt b/muse2/synti/CMakeLists.txt
index ee358879..b2bc87ea 100644
--- a/muse2/synti/CMakeLists.txt
+++ b/muse2/synti/CMakeLists.txt
@@ -30,9 +30,9 @@ include_directories(
 # set (SubDirs libsynti s1 organ deicsonze deicsonze2 simpledrums vam)
 set (SubDirs libsynti s1 organ deicsonze simpledrums vam)
 
-if (ENABLE_FLUID)
+if (HAVE_FLUIDSYNTH)
       set (SubDirs ${SubDirs} fluid fluidsynth )
-endif (ENABLE_FLUID)
+endif (HAVE_FLUIDSYNTH)
 
 subdirs(${SubDirs})
 
diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
index 2d9ddfbf..e705e0ae 100644
--- a/muse2/synti/deicsonze/CMakeLists.txt
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -58,6 +58,6 @@ target_link_libraries(deicsonze
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
 
-# install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze ARCH_ALIN )
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze README )
+# install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze ARCH_ALIN )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze README )
diff --git a/muse2/synti/deicsonze2/CMakeLists.txt b/muse2/synti/deicsonze2/CMakeLists.txt
index 98457f5c..430953ca 100644
--- a/muse2/synti/deicsonze2/CMakeLists.txt
+++ b/muse2/synti/deicsonze2/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries(deicsonze
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
 
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt
index 81cf1e18..82bc6e5f 100644
--- a/muse2/synti/fluid/CMakeLists.txt
+++ b/muse2/synti/fluid/CMakeLists.txt
@@ -39,12 +39,12 @@ target_link_libraries( fluid synti )
 set_target_properties ( fluid
    PROPERTIES PREFIX ""
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
-   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   LINK_FLAGS "${FLUID_LIBRARIES}"
    )
 target_link_libraries(fluid
       synti
       ${QT_LIBRARIES}
-      ${FLUID_LIB}
+      ${FLUID_LIBRARIES}
       )
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluid )
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index 7efa53d6..1a10ba06 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -39,13 +39,13 @@ target_link_libraries( fluidsynth synti )
 set_target_properties ( fluidsynth 
    PROPERTIES PREFIX ""
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
-   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   LINK_FLAGS "${FLUID_LIBRARIES}"
    )
 
 target_link_libraries(fluidsynth
       synti
       ${QT_LIBRARIES}
-      ${FLUID_LIB}
+      ${FLUID_LIBRARIES}
       )
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
@@ -53,5 +53,5 @@ install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsyn
 # FIXME: Won't work
 # install_files ( /${MusE_INSTALL_NAME}/synthi TODO README.txt )
 
-install_files ( /share/${MusE_INSTALL_NAME}/synthi TODO )
-install_files ( /share/${MusE_INSTALL_NAME}/synthi README.txt )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi TODO )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi README.txt )