patch for x86_64-biarch systems from Detlef Reichelt

15 files changed, 21 insertions, 13 deletions

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index bd5a66ea..12dbade5 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -21,6 +21,11 @@
 project(muse)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1)
 
+# set libdir if not use -DCMAKE_INSTALL_LIBDIR
+if (NOT CMAKE_INSTALL_LIBDIR)
+	SET(CMAKE_INSTALL_LIBDIR "lib")
+endif (NOT CMAKE_INSTALL_LIBDIR)
+
 # set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_BUILD_TYPE Release)
 
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 6289b3b3..b595e5cd 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,6 @@
+4.10 (ws)
+      - misc fixes for graphical controller editor
+      - patch for x86_64-biarch systems from Detlef Reichelt
 1.10 (ws)
       - changed locking of audio and midi sequencer thread (in my setup this
         results in xrun free operation at 2.9 msec latency (kernel 2.6.18-rt5)
diff --git a/muse/awl/CMakeLists.txt b/muse/awl/CMakeLists.txt
index 6af2bc2f..019e2dfc 100644
--- a/muse/awl/CMakeLists.txt
+++ b/muse/awl/CMakeLists.txt
@@ -90,7 +90,7 @@ ELSE (APPLE)
       al pthread asound
       )
 
-   install_targets ( /lib/${MusE_INSTALL_NAME}/designer/ awlplugin )
+   install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/designer/ awlplugin )
 
    add_executable( ltest ltest.cpp )
    target_link_libraries ( ltest 
diff --git a/muse/midiplugins/dump/CMakeLists.txt b/muse/midiplugins/dump/CMakeLists.txt
index a78026ff..c607ef1f 100644
--- a/muse/midiplugins/dump/CMakeLists.txt
+++ b/muse/midiplugins/dump/CMakeLists.txt
@@ -36,5 +36,5 @@ set_target_properties ( dump
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
    )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/midiplugins/ dump )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ dump )
 
diff --git a/muse/midiplugins/filter/CMakeLists.txt b/muse/midiplugins/filter/CMakeLists.txt
index 420a6c00..7bdb8544 100644
--- a/muse/midiplugins/filter/CMakeLists.txt
+++ b/muse/midiplugins/filter/CMakeLists.txt
@@ -45,5 +45,5 @@ set_target_properties ( filter
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
    )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/midiplugins/ filter )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ filter )
 
diff --git a/muse/midiplugins/metronom/CMakeLists.txt b/muse/midiplugins/metronom/CMakeLists.txt
index f423d99c..5153e6d4 100644
--- a/muse/midiplugins/metronom/CMakeLists.txt
+++ b/muse/midiplugins/metronom/CMakeLists.txt
@@ -42,5 +42,5 @@ set_target_properties ( metronom
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
    )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/midiplugins/ metronom )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ metronom )
 
diff --git a/muse/midiplugins/transform/CMakeLists.txt b/muse/midiplugins/transform/CMakeLists.txt
index 826c721b..1ac2652c 100644
--- a/muse/midiplugins/transform/CMakeLists.txt
+++ b/muse/midiplugins/transform/CMakeLists.txt
@@ -41,5 +41,5 @@ set_target_properties ( transform
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
    )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/midiplugins/ transform )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ transform )
 
diff --git a/muse/midiplugins/trigg/CMakeLists.txt b/muse/midiplugins/trigg/CMakeLists.txt
index aa270f20..397ccf81 100644
--- a/muse/midiplugins/trigg/CMakeLists.txt
+++ b/muse/midiplugins/trigg/CMakeLists.txt
@@ -43,5 +43,5 @@ set_target_properties ( trigg
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
    )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/midiplugins/ trigg )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ trigg )
 
diff --git a/muse/plugins/freeverb/CMakeLists.txt b/muse/plugins/freeverb/CMakeLists.txt
index 5a0d57b0..e5ccc677 100644
--- a/muse/plugins/freeverb/CMakeLists.txt
+++ b/muse/plugins/freeverb/CMakeLists.txt
@@ -29,4 +29,4 @@ set_target_properties (freeverb
       PROPERTIES PREFIX ""
       )
 
-install_files( /lib/${MusE_INSTALL_PATH}/plugins freeverb)
+install_files( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_PATH}/plugins freeverb)
diff --git a/muse/synti/deicsonze/CMakeLists.txt b/muse/synti/deicsonze/CMakeLists.txt
index a4529011..9266f9ce 100644
--- a/muse/synti/deicsonze/CMakeLists.txt
+++ b/muse/synti/deicsonze/CMakeLists.txt
@@ -45,6 +45,6 @@ target_link_libraries(deicsonze
       ${QT_LIBRARIES}
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ deicsonze )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
 
 install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
\ No newline at end of file
diff --git a/muse/synti/fluid/CMakeLists.txt b/muse/synti/fluid/CMakeLists.txt
index 7723b507..e51ea9c6 100644
--- a/muse/synti/fluid/CMakeLists.txt
+++ b/muse/synti/fluid/CMakeLists.txt
@@ -46,5 +46,5 @@ target_link_libraries(fluid
       ${FLUID_LIB}
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluid )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluid )
 
diff --git a/muse/synti/fluidsynth/CMakeLists.txt b/muse/synti/fluidsynth/CMakeLists.txt
index 9e9f619f..5fdc3533 100644
--- a/muse/synti/fluidsynth/CMakeLists.txt
+++ b/muse/synti/fluidsynth/CMakeLists.txt
@@ -47,5 +47,5 @@ target_link_libraries(fluidsynth
       ${FLUID_LIB}
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
 
diff --git a/muse/synti/organ/CMakeLists.txt b/muse/synti/organ/CMakeLists.txt
index d15eaa2d..4a185799 100644
--- a/muse/synti/organ/CMakeLists.txt
+++ b/muse/synti/organ/CMakeLists.txt
@@ -46,5 +46,5 @@ target_link_libraries(organ
       ${QT_LIBRARIES}
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ organ )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ organ )
 
diff --git a/muse/synti/s1/CMakeLists.txt b/muse/synti/s1/CMakeLists.txt
index 0747980c..fe5a3393 100644
--- a/muse/synti/s1/CMakeLists.txt
+++ b/muse/synti/s1/CMakeLists.txt
@@ -30,5 +30,5 @@ set_target_properties ( s1 PROPERTIES PREFIX "" )
 target_link_libraries(s1
       synti
       )
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ s1 )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ s1 )
 
diff --git a/muse/synti/vam/CMakeLists.txt b/muse/synti/vam/CMakeLists.txt
index c4d4930d..5311f3bf 100644
--- a/muse/synti/vam/CMakeLists.txt
+++ b/muse/synti/vam/CMakeLists.txt
@@ -46,5 +46,5 @@ target_link_libraries(vam
       ${QT_LIBRARIES}
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ vam )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ vam )