Merge lp:~davidgomes/granite/fix-fedora-build into lp:~elementary-pantheon/granite/granite

[David Gomes]

Fixes building on Fedora.

[Rico Tzschichholz (ricotz)]

Better look into using "CMAKE_INSTALL_FULL_LIBDIR"

review: Needs Information

[Rico Tzschichholz (ricotz)]

Or just "CMAKE_INSTALL_LIBDIR"

To pass a properly suffixed libdir and maybe require a recent cmake which includes "GNUInstallDirs" is the responsibility of the fedora packaging.

Unmerged revisions

671. By Michel Lind on 2013-12-29

Fixed compilation on Fedora.

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2013-12-23 20:13:56 +0000
+++ lib/CMakeLists.txt	2013-12-29 13:59:02 +0000
@@ -64,7 +64,7 @@
 if(NOT DEFINED LIB_INSTALL_DIR)
     set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 endif()
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 
 # Link all
 set (CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
@@ -105,7 +105,7 @@
     VERSION ${PKG_SOVERSION}.${PKG_SOMINOR}
     SOVERSION ${PKG_SOVERSION})
 
-install (TARGETS ${PKG_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install (TARGETS ${PKG_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 
 ###########################
 # GObject Introspection

=== modified file 'lib/granite.pc.cmake'
--- lib/granite.pc.cmake	2012-11-23 20:58:45 +0000
+++ lib/granite.pc.cmake	2013-12-29 13:59:02 +0000
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@DOLLAR@{prefix}
-libdir=@DOLLAR@{prefix}/lib
+libdir=@DOLLAR@{prefix}/lib@LIB_SUFFIX@
 includedir=@DOLLAR@{prefix}/include
 
 Name: granite