Use LIB_SUFFIX in pkg-config information

neocturne · neocturne · commit f2ca23547efc · 2013-12-26T06:01:01.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,10 +9,12 @@ set(DOXYFILE_EXTRA_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 include(UseDoxygen OPTIONAL)
 
+set(LIBDIR "lib${LIB_SUFFIX}")
+
 add_subdirectory(src)
 
 configure_file(${LIBUECC_SOURCE_DIR}/libuecc.pc.in ${LIBUECC_BINARY_DIR}/libuecc.pc @ONLY)
-install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "lib/pkgconfig")
+install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "${LIBDIR}/pkgconfig")
 
 FILE(GLOB include_files "${CMAKE_CURRENT_SOURCE_DIR}/include/libuecc/*.h")
 install(FILES ${include_files} DESTINATION "include/libuecc-${PROJECT_VERSION}/libuecc")
diff --git a/libuecc.pc.in b/libuecc.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIBDIR@
 includedir=${prefix}/include
 
 Name: libuecc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(uecc_static PROPERTIES
 )
 
 install(TARGETS uecc_shared uecc_static
-  ARCHIVE DESTINATION lib${LIB_SUFFIX}
-  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION ${LIBDIR}
+  LIBRARY DESTINATION ${LIBDIR}
   RUNTIME DESTINATION bin
 )

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ set_target_properties(uecc_static PROPERTIES`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`install(TARGETS uecc_shared uecc_static`
`21`		`- ARCHIVE DESTINATION lib${LIB_SUFFIX}`
`22`		`- LIBRARY DESTINATION lib${LIB_SUFFIX}`
	`21`	`+ ARCHIVE DESTINATION ${LIBDIR}`
	`22`	`+ LIBRARY DESTINATION ${LIBDIR}`
`23`	`23`	`RUNTIME DESTINATION bin`
`24`	`24`	`)`