OpenMW · psi29a · Jan 29, 2026 · Jan 23, 2026 · Jan 23, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,6 +141,15 @@ IF(NOT CMAKE_BUILD_TYPE)
     SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 ENDIF()
 
+include(GNUInstallDirs)
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
+    cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}" OUTPUT_VARIABLE RELATIVE_LIBDIR)
+    cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_INCLUDEDIR BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}" OUTPUT_VARIABLE RELATIVE_INCLUDEDIR)
+else()
+    file(RELATIVE_PATH RELATIVE_LIBDIR ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
+    file(RELATIVE_PATH RELATIVE_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+endif()
 
 IF(ANDROID)
     INCLUDE(OsgAndroidMacroUtils)
@@ -883,18 +892,6 @@ IF(CYGWIN)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 ENDIF()
 
-# Set OSG_INSTALL_LIBDIR to specify the installation directories of object code libraries
-IF(DEFINED LIB_POSTFIX)
-  # Use LIB_POSTFIX if defined
-  SET(OSG_INSTALL_LIBDIR lib${LIB_POSTFIX})
-ELSE()
-  INCLUDE(GNUInstallDirs)
-  SET(OSG_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
-ENDIF()
-IF(NOT DEFINED LIB_POSTFIX)
-    SET(LIB_POSTFIX "")
-ENDIF()
-
 # Here we apparently do some funky stuff with making the bin/ and lib/
 # folders which is probably needed to work around a very old CMake bug?
 
@@ -936,11 +933,6 @@ FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})        # For each configuration (Debu
     ENDIF()
 ENDFOREACH()
 
-#SET(INSTALL_BINDIR OpenSceneGraph/bin)
-#SET(INSTALL_INCDIR OpenSceneGraph/include)
-#SET(INSTALL_LIBDIR OpenSceneGraph/lib)
-#SET(INSTALL_DOCDIR OpenSceneGraph/doc)
-
 ################################################################################
 # User Options
 
@@ -1190,7 +1182,7 @@ IF(BUILD_DOCUMENTATION)
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
     )
-    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+
     INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openscenegraph-doc)
 
     # now set up openthreads documentation generation
@@ -1206,7 +1198,7 @@ IF(BUILD_DOCUMENTATION)
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
     )
-    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+
     INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openthreads-doc)
 
     # Process our other doxyfiles but don't create targets for these
@@ -1275,7 +1267,7 @@ FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})
     ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
     @ONLY
     )
-  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
+  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT libopenscenegraph-dev)
 ENDFOREACH(PKGCONFIG_FILE)
 
 
@@ -1288,7 +1280,7 @@ IF(REQUIRES_LIBPATH_MESSAGE)
     IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
         SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
 
-        MESSAGE("\nThe build system is configured to install libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n"
+        MESSAGE("\nThe build system is configured to install libraries to ${CMAKE_INSTALL_FULL_LIBDIR}\n"
             "Your applications may not be able to find your installed libraries unless you:\n"
             "    set your LD_LIBRARY_PATH (user specific) or\n"
             "    update your ld.so configuration (system wide)")
@@ -1310,12 +1302,12 @@ IF(REQUIRES_LIBPATH_MESSAGE)
             IF(EXISTS /etc/ld.so.conf)
                 MESSAGE("You have an ld.so.conf file in /etc, if you wish to ensure \n"
                 "that applications find the installed osg libraries, system wide, you\n"
-                "could add ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX} to it.")
+                "could add ${CMAKE_INSTALL_FULL_LIBDIR} to it.")
             ENDIF()
         ENDIF()
 
         # emit a message during installation.
-        INSTALL(CODE "MESSAGE(\"Libraries were installed to ${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX}.\\nYou may need to update your ld.so configuration. \")")
+        INSTALL(CODE "MESSAGE(\"Libraries were installed to ${CMAKE_INSTALL_FULL_LIBDIR}.\\nYou may need to update your ld.so configuration. \")")
 
     ENDIF()
 

diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake
@@ -4,16 +4,6 @@
 # ${LIB_NAME}
 # ${TARGET_H}
 
-SET(INSTALL_INCDIR include)
-SET(INSTALL_BINDIR bin)
-IF(WIN32)
-    SET(INSTALL_LIBDIR bin)
-    SET(INSTALL_ARCHIVEDIR lib)
-ELSE()
-    SET(INSTALL_LIBDIR lib${LIB_POSTFIX})
-    SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX})
-ENDIF()
-
 SET(HEADERS_GROUP "Header Files")
 
 SOURCE_GROUP(
@@ -25,21 +15,29 @@ IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
     HANDLE_MSVC_DLL()
 ENDIF()
 
-INSTALL(
-    TARGETS ${LIB_NAME}
-    RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph
-    LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph
-    ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev    
-)
+# Keep pre-existing WIN32 INSTALL_LIBDIR=bin setting
+IF(WIN32)
+    INSTALL(TARGETS ${LIB_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libopenscenegraph
+        LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libopenscenegraph
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libopenscenegraph-dev
+    )
+ELSE()
+    INSTALL(TARGETS ${LIB_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libopenscenegraph
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libopenscenegraph
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libopenscenegraph-dev
+    )
+ENDIF()
 
 IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
-    INSTALL(FILES $<TARGET_PDB_FILE:${LIB_NAME}> DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads)
+    INSTALL(FILES $<TARGET_PDB_FILE:${LIB_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libopenthreads)
 ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
 
 IF(NOT OSG_COMPILE_FRAMEWORKS)
     INSTALL (
         FILES        ${TARGET_H}
-        DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIB_NAME}
         COMPONENT libopenscenegraph-dev
     )
 ELSE()

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
@@ -264,21 +264,21 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     ENDIF()
     SETUP_LINK_LIBRARIES()
 
-#the installation path are differentiated for win32 that install in bin versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}
+# installation paths are differentiated for win32 installing in bin versus other architectures that install in ${CMAKE_INSTALL_LIBDIR}/${OSG_PLUGINS}
     IF(WIN32)
         INSTALL(TARGETS ${TARGET_TARGETNAME}
-            RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
-            ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
-            LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PACKAGE_COMPONENT}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev)
         IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
             INSTALL(FILES $<TARGET_PDB_FILE:${TARGET_TARGETNAME}> DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
-        ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
-    ELSE(WIN32)
+        ENDIF()
+    ELSE()
         INSTALL(TARGETS ${TARGET_TARGETNAME}
-            RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
-            ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
-            LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
-    ENDIF(WIN32)
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PACKAGE_COMPONENT}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev)
+    ENDIF()
 ENDMACRO(SETUP_PLUGIN)
 
 

diff --git a/packaging/ld.so.conf.d/openscenegraph.conf.in b/packaging/ld.so.conf.d/openscenegraph.conf.in
@@ -1,2 +1,2 @@
 # openscenegraph library configuration
-${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}
+${CMAKE_INSTALL_FULL_LIBDIR}
diff --git a/packaging/pkgconfig/openscenegraph-osg.pc.in b/packaging/pkgconfig/openscenegraph-osg.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osg
 Description: 3D scenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in b/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgAnimation
 Description: Skinning and morphing library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgDB.pc.in b/packaging/pkgconfig/openscenegraph-osgDB.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgDB
 Description: File format reading library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgFX.pc.in b/packaging/pkgconfig/openscenegraph-osgFX.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgFX
 Description: Special effects library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgGA.pc.in b/packaging/pkgconfig/openscenegraph-osgGA.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgGA
 Description: GUI event library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in b/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgManipulator
 Description: Manipulator library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgParticle.pc.in b/packaging/pkgconfig/openscenegraph-osgParticle.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgParticle
 Description: Particle system library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgShadow.pc.in b/packaging/pkgconfig/openscenegraph-osgShadow.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgShadow
 Description: Shadow techniques library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgSim.pc.in b/packaging/pkgconfig/openscenegraph-osgSim.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgSim
 Description: Simulator utility library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in b/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgTerrain
 Description: Terrain library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgText.pc.in b/packaging/pkgconfig/openscenegraph-osgText.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgText
 Description: Text rendering library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgUtil.pc.in b/packaging/pkgconfig/openscenegraph-osgUtil.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgUtil
 Description: Utility library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgViewer.pc.in b/packaging/pkgconfig/openscenegraph-osgViewer.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgViewer
 Description: Windowing system setup, thread scene manager library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgVolume.pc.in b/packaging/pkgconfig/openscenegraph-osgVolume.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgVolume
 Description: Volume library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph-osgWidget.pc.in b/packaging/pkgconfig/openscenegraph-osgWidget.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph-osgWidget
 Description: Windowing toolkit library for Openscenegraph

diff --git a/packaging/pkgconfig/openscenegraph.pc.in b/packaging/pkgconfig/openscenegraph.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openscenegraph
 Description: 3D scenegraph

diff --git a/packaging/pkgconfig/openthreads.pc.in b/packaging/pkgconfig/openthreads.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_POSTFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@RELATIVE_LIBDIR@
+includedir=${prefix}/@RELATIVE_INCLUDEDIR@
 
 Name: openthreads
 Description: Object-Oriented (OO) thread interface for C++ programmers

diff --git a/src/OpenThreads/CMakeLists.txt b/src/OpenThreads/CMakeLists.txt
@@ -113,4 +113,4 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openthreads.pc.in
     @ONLY
     )
 
-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig  COMPONENT libopenthreads-dev)
+INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig  COMPONENT libopenthreads-dev)
-Original file line number
+Diff line change
@@ Expand Up @@
         @ONLY
         )
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig  COMPONENT libopenthreads-dev)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig  COMPONENT libopenthreads-dev)