Blob Blame History Raw
diff -rupN fluidsynth-1.1.5.old/CMakeLists.txt fluidsynth-1.1.5/CMakeLists.txt
--- fluidsynth-1.1.5.old/CMakeLists.txt	2011-09-04 03:38:58.000000000 -0400
+++ fluidsynth-1.1.5/CMakeLists.txt	2011-09-16 00:26:23.000000000 -0400
@@ -407,12 +407,12 @@ if ( UNIX )
     # pkg-config support
     set ( prefix "${CMAKE_INSTALL_PREFIX}" )
     set ( exec_prefix "\${prefix}" )
-    set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}${LIB_SUFFIX}" )
-    set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" )
+    set ( libdir "${LIB_INSTALL_DIR}" )
+    set ( includedir "${INCLUDE_INSTALL_DIR}" )
     configure_file ( fluidsynth.pc.in
         ${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY )
     install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc
-        DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}/pkgconfig )
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
 
     # uninstall custom target
     configure_file ( "${CMAKE_SOURCE_DIR}/cmake_admin/cmake_uninstall.cmake.in"
diff -rupN fluidsynth-1.1.5.old/src/CMakeLists.txt fluidsynth-1.1.5/src/CMakeLists.txt
--- fluidsynth-1.1.5.old/src/CMakeLists.txt	2011-09-04 03:38:58.000000000 -0400
+++ fluidsynth-1.1.5/src/CMakeLists.txt	2011-09-16 00:26:39.000000000 -0400
@@ -324,8 +324,8 @@ if ( MACOSX_FRAMEWORK )
 else ( MACOSX_FRAMEWORK )
   install ( TARGETS fluidsynth libfluidsynth
     RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 )
 endif ( MACOSX_FRAMEWORK )