pyrox.dev
lol
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index f222aab..262b505 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -89,7 +89,6 @@ target_include_directories(
6 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
7 $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
8 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
9- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}>
10 )
11 target_include_directories(
12 "${PROJECT_NAME}-lib"
13@@ -132,7 +131,7 @@ install(
14 install(
15 DIRECTORY
16 "${CMAKE_CURRENT_BINARY_DIR}/include/"
17- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}"
18+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/"
19 )
20 if(WITH_API)
21 enable_language("C")
22diff --git a/config/template.cmake b/config/template.cmake
23index 8b5141d..8f94d66 100644
24--- a/config/template.cmake
25+++ b/config/template.cmake
26@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
27 set(
28 "@PROJECT_NAME@_INCLUDE_DIRS"
29 "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
30- "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@"
31 )
32 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
33
34diff --git a/config/template.pc b/config/template.pc
35index 3d6efbb..fea69e4 100644
36--- a/config/template.pc
37+++ b/config/template.pc
38@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@
39 Description: @PROJECT_DESCRIPTION@
40 Version: @PROJECT_VERSION@
41 Libs: -L${libdir} -l@PROJECT_NAME@
42-Cflags: -I${includedir} -I${includedir}/@module-dir@
43+Cflags: -I${includedir} -I${includedir}/
44diff --git a/meson.build b/meson.build
45index c9e9c58..ac8f0bd 100644
46--- a/meson.build
47+++ b/meson.build
48@@ -83,7 +83,7 @@ if install
49 )
50 endif
51
52- module_id = meson.project_name() / fc_id + '-' + fc.version()
53+ module_id = meson.project_name()
54 meson.add_install_script(
55 find_program(files('config'/'install-mod.py')),
56 get_option('includedir') / module_id,