3 files changed, 62 insertions, 39 deletions

diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
index 05546081..c311b05a 100644
--- a/muse2/synti/deicsonze/CMakeLists.txt
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -18,54 +18,91 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-include(${PROJECT_SOURCE_DIR}/pch.txt)
-
-QT4_WRAP_CPP ( deicsonze_mocs deicsonzegui.h )
+##
+## Expand Qt macros in source files
+##
+QT4_WRAP_CPP ( deicsonze_mocs
+      deicsonzegui.h
+      )
 
-file (GLOB UI_FILES deicsonzegui.ui )
-QT4_WRAP_UI ( deicsonze_uis ${UI_FILES} )
+##
+## UI files
+##
+file (GLOB deicsonze_ui_files
+      deicsonzegui.ui
+      )
+QT4_WRAP_UI ( deicsonze_uis ${deicsonze_ui_files} )
 
+##
+## Resource files
+##
 QT4_ADD_RESOURCES (deicsonze_qrc_files
-                  deicsonze.qrc
-                  )
+      deicsonze.qrc
+      )
 
-file (GLOB SOURCE_FILES
+##
+## List of source files to compile
+##
+file (GLOB deicsonze_source_files
       deicsonze.cpp
       deicsonzepreset.cpp
       deicsonzeplugin.cpp
       deicsonzefilter.cpp
       deicsonzegui.cpp
-      deicsonzegui.h
       )
 
+##
+## Define target
+##
 add_library ( deicsonze SHARED
-      ${SOURCE_FILES}
-      ${PROJECT_BINARY_DIR}/all.h
-      ${PROJECT_BINARY_DIR}/all-pic.h.pch
+      ${deicsonze_source_files}
       ${deicsonze_mocs}
       ${deicsonze_uis}
       ${deicsonze_qrc_files}
       )
 
-set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${SOURCE_FILES} ${UI_FILES} CACHE INTERNAL "")
-
-target_link_libraries( deicsonze synti )
+##
+## Append to the list of translations
+##
+set (FILES_TO_TRANSLATE
+      ${FILES_TO_TRANSLATE}
+      ${deicsonze_source_files}
+      ${deicsonze_ui_files}
+      CACHE INTERNAL ""
+      )
 
+##
+## Compilation flags and target name
+##
 # - tell cmake to name target deicsonze.so instead of
 #   libdeicsonze.so
 # - use precompiled header files
 #
 set_target_properties ( deicsonze
-   PROPERTIES PREFIX ""
-   #COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
-   COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
-   )
+      PROPERTIES PREFIX ""
+      #COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
+      COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
+      )
 
+##
+## Linkage
+##
 target_link_libraries(deicsonze
-      al awl synti
+      al
+      awl
+      synti
       ${QT_LIBRARIES}
       )
 
-install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
-
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+##
+## Install location
+##
+install( TARGETS deicsonze
+      DESTINATION ${MusE_SYNTHI_DIR}
+      )
+install( FILES SutulaBank.dei
+      DESTINATION ${MusE_SHARE_DIR}/presets/deicsonze
+      )
+install( FILES README TODO
+      DESTINATION ${MusE_DOC_DIR}/deicsonze
+      )
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 6d86eda9..049daeed 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -121,13 +121,7 @@ DeicsOnze::DeicsOnze() : Mess(2) {
   _saveConfig = true;
   _isInitSet = true; //false if an initial bank must be download
   
-  ///_initSetPath = INSTPREFIX "/share/muse-" VERSION "/presets/deicsonze/SutulaBank.dei";
-  //"/usr/local/share/muse-1.0pre1/presets/deicsonze/SutulaBank.dei";
-  
-  // Tim.
-  QString sharePath(QString(INSTPREFIX) + QString("/") +                                             
-                            QString(SHAREINSTPREFIX) + QString("/") +  // This has no prefix. Default is "share", set in top cmake script.
-                            QString(INSTALL_NAME));   
+  QString sharePath(SHAREDIR);
   _initSetPath = sharePath + QString("/presets/deicsonze/SutulaBank.dei");
   
   
@@ -135,7 +129,6 @@ DeicsOnze::DeicsOnze() : Mess(2) {
   //INSTPREFIX + "/share/" + PACKAGEVERSION + "/presets/deicsonze/ARCH_ALIN";
   _isBackgroundPix = true; //false if an initial bank must be download
   
-  ///_backgroundPixPath = INSTPREFIX "/share/muse-" VERSION "/wallpapers/paper2.jpg";
   //"/usr/local/share/muse-1.0pre1/wallpapers/abstractdeicsonze1.jpg";
   _backgroundPixPath = sharePath + QString("/wallpapers/paper2.jpg");    // Tim.
   
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index 8f9fafd0..84cf4d22 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -440,18 +440,11 @@ DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
   setEnabledPreset(false);
   
   // Tim.
-  QString sharePath(QString(INSTPREFIX) + QString("/") +                                             
-                            QString(SHAREINSTPREFIX) + QString("/") +  // This has no prefix. Default is "share", set in top cmake script.
-                            QString(INSTALL_NAME));   
-                            
+  QString sharePath(SHAREDIR);                            
   updateInitSetPath
-    ///(INSTPREFIX "/share/muse-" VERSION "/presets/deicsonze/SutulaBank.dei");
     (sharePath + QString("/presets/deicsonze/SutulaBank.dei"));    // Tim.
     
-    //"/usr/local/share/muse-1.0pre1/presets/deicsonze/SutulaBank.dei")
-    //);
   updateBackgroundPixPath
-    ///(INSTPREFIX "/share/muse-" VERSION "/wallpapers/paper2.jpg");
     (sharePath + QString("/wallpapers/paper2.jpg"));    // Tim.
     
   updateBackgroundPixCheckBox(true);