Merge pull request #159 from jcorporation/devel

Merge devel into master for 5.6.1 release

CMakeLists.txt

@@ -6,39 +6,46 @@ project (mympd)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "5")
 set(CPACK_PACKAGE_VERSION_MINOR "6")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 
 if(EXISTS "/etc/arch-release")
-  set(WEBAPPS "/webapps")
+  set(WEBAPPS "/webapps/${PROJECT_NAME}")
 else()
   set(WEBAPPS "")
 endif()
 
 if("${CMAKE_INSTALL_PREFIX}" MATCHES "/usr")
-  set(SUBDIR "${WEBAPPS}/${PROJECT_NAME}")
-  set(SUBDIRVAR "/${PROJECT_NAME}")
-  set(SUBDIRVARLIB "/lib")
+  set(SUBDIR_ETC "${WEBAPPS}")
+  set(SUBDIR "/${PROJECT_NAME}")
+  set(SUBDIRLIB "/lib")
 else() 
+  set(SUBDIR_ETC "")
   set(SUBDIR "")
-  set(SUBDIRVAR "")
-  set(SUBDIRVARLIB "")
+  set(SUBDIRLIB "")
 endif()
 
+set(ETC_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR}${SUBDIR_ETC}")
+MESSAGE("ETC_PATH: ${ETC_PATH}")
+
+MESSAGE("BIN_PATH: ${CMAKE_INSTALL_FULL_BINDIR}")
+
+set(PLUGIN_PATH "${CMAKE_INSTALL_FULL_LIBDIR}${SUBDIR}")
+MESSAGE("PLUGIN_PATH: ${PLUGIN_PATH}")
+
+set(VARLIB_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}${SUBDIRLIB}${SUBDIR}")
+if("${CMAKE_INSTALL_PREFIX}" MATCHES "/usr/local")
+  set(VARLIB_PATH "/${CMAKE_INSTALL_LOCALSTATEDIR}${SUBDIRLIB}${SUBDIR}")
+endif()
+MESSAGE("VARLIB_PATH: ${VARLIB_PATH}")
+
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-  set(ASSETS_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}${SUBDIRVARLIB}${SUBDIRVAR}/empty")
+  set(ASSETS_PATH "${VARLIB_PATH}/empty")
   set(DEBUG "OFF")
 else()
   set(ASSETS_PATH "${PROJECT_SOURCE_DIR}/htdocs")
   set(DEBUG "ON")
 endif()
-
 MESSAGE("ASSETS_PATH: ${ASSETS_PATH}")
-set(ETC_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR}${WEBAPPS}")
-MESSAGE("ETC_PATH: ${ETC_PATH}")
-set(PLUGIN_PATH "${CMAKE_INSTALL_FULL_LIBDIR}${SUBDIRVAR}")
-MESSAGE("PLUGIN_PATH: ${PLUGIN_PATH}")
-set(VARLIB_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}${SUBDIRVARLIB}${SUBDIRVAR}")
-MESSAGE("VARLIB_PATH: ${VARLIB_PATH}")
 
 find_package(LibMPDClient REQUIRED)
 find_package(Threads REQUIRED)
@@ -114,7 +121,7 @@ target_link_libraries(mympd ${LIBMPDCLIENT_LIBRARY} ${OPENSSL_LIBRARIES} ${CMAKE
 if(LIBMEDIAINFO_FOUND)
   add_library(mympd_coverextract SHARED src/plugins/mympd_coverextract.cpp)
 
-  install(TARGETS mympd_coverextract DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}${SUBDIRVAR}/)
+  install(TARGETS mympd_coverextract DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}${SUBDIR}/)
 
   #testcoverextract executable
   add_executable(test_coverextract src/plugins/test_coverextract.c)