media-libs/devil:

Bump devil version to v1.8 and fix CMake build.
Do the some for the live ebuild (9999).

Signed-off-by: Peter Asplund <peter.azp@gmail.com>

5 files changed, 223 insertions, 72 deletions

diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index d5832b9..0b1d2e8 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -5,8 +5,10 @@ AUX devil-1.7.8-libpng14.patch 1221 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad99
 AUX devil-1.7.8-nvtt-glut.patch 2477 SHA256 7660558de9615d617027f501f93e7472647696fb5cd7c02dee31cb2a42969383 SHA512 08fc08f2ef37a19eb0d5f0d904814d659ff6133f479a323420d8cc1922b2c836e5f7d23cc52bddd723fe51a747cc40646df75c16fdb3c2a1a08a1967f0d842e0 WHIRLPOOL 96a17dff33a6c0daa7833b223078bb3df7a95b965bee0ec1b05aa2caa2a15e46a2a8b4e5bedd4c504f070102cf8e2cc99a41042291b55803c76b4ee61b050070
 AUX devil-1.7.8-restrict.patch 587 SHA256 f30f4f95a208963af7fcf5de68c2a94db55911b34b9feef2c4324673388784c3 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db WHIRLPOOL d7633320ba62b81f80aa91a42228c70afe647f466f63ecc68e55afcfd3875ff05f00669a08db7bbcfa2e3c26e29d12fc02c0947dc46116ee3ca4460c8f4e3b9f
 AUX devil-1.7.8-uchar.patch 739 SHA256 8c24e84fb82a1c939d7cf05c55c9ebf903eef59dc5730fc78568e9a117d216b4 SHA512 cf611410bb61877a416ecb573c42c78f94eae78f9a2c6105cf82d095ca68fb25d995cbfefb0f5bac942eb03f13278305a2e43106f976aff4608cad0307a1e657 WHIRLPOOL d32a269583d5d2e6804a2e10d60c2f0e9b934472dcf667da27dfd46a147b8ac5bcfb2a4818e6c096a859af343423772c1b6ef1a4b355d8e7851c7134a526c404
+AUX devil-1.8.0-cmake-install-paths.patch 2765 SHA256 31e6e7e4af92b692be0425b25beb4509bc884d683417a53594f6b6ad2d64eda5 SHA512 22309fda520ac07ba2daa4d96f25e5a908450f3fec3718bd7e98e4a9e706e2c8189a109ccfc8b24e36cf013d3a7f5dec831399d622ac6536d764b50bc95bcf01 WHIRLPOOL e8611fef79f63869e0a0e958653442d538bf2222b2fb4709105e1c24ed316b5be80bf0d34a81917e147651b74cfbfbb1fac75ae6dbeb49be9af73c45c03f4758
+AUX devil-9999-cmake-install-paths.patch 2765 SHA256 31e6e7e4af92b692be0425b25beb4509bc884d683417a53594f6b6ad2d64eda5 SHA512 22309fda520ac07ba2daa4d96f25e5a908450f3fec3718bd7e98e4a9e706e2c8189a109ccfc8b24e36cf013d3a7f5dec831399d622ac6536d764b50bc95bcf01 WHIRLPOOL e8611fef79f63869e0a0e958653442d538bf2222b2fb4709105e1c24ed316b5be80bf0d34a81917e147651b74cfbfbb1fac75ae6dbeb49be9af73c45c03f4758
 DIST v1.8.0.tar.gz 2949100 SHA256 52129f247b26fcb5554643c9e6bbee75c4b9717735fdbf3c6ebff08cee38ad37 SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7 WHIRLPOOL ba326cba2841cb4b11679fcb745701861130eb41628fee64323142f5f199dd3cc5f3de9dabc3dc01834f6419256102cde8d80fab78df2c7c544c895f336dd511
-EBUILD devil-1.8.0.ebuild 1992 SHA256 e54221a0cda6e0e985fdf05b864bbbc6f07369332ccd4e2dae238cafd4d7c92d SHA512 5339cd51ebb9f47c9ef412c672835374f09d064648249faed5fbc7eb7d24f144264279e9e17000b07af39647118816e411ea4bcc934917e0122cffe7e0daf430 WHIRLPOOL 7b2c9bb4559a4553b548e3c896e7e0e3c533399011155cf433d5393bb7d95c80ec4fda27d65c9a5fec11a4681a9e567882b318d0f64c8084a11854881bcc8fc6
-EBUILD devil-9999.ebuild 1998 SHA256 648060ecf1dff921950692bbe16522b5b8975fec6029f2db44cda8881be85f49 SHA512 7ab3f5431cdecdac60c2ec7a818c5334b21fa50add066643892969488a8300663052cbf7a8c474511e73fff0feaedcb4127dd572b5e74851d346c1c5151d4a41 WHIRLPOOL 73be6e502aafa097d56fdebf826d28bafcb0f1caf1c6e9ecf34bfe10b4b0a305d1f89c9a4ff2b4f4ad868e3a679982a16952f667aa1ac889851c409672c983ff
+EBUILD devil-1.8.0.ebuild 1599 SHA256 11a209174b02e8f85e3bc3ccf4a3295e75759aad776b09c8cd2af23d1a4eceac SHA512 df09c36c55578b362a80c2d65f8f0b5a1eff48d90113c515706e0859198d68834f19531ca98cb125964652d1b90c58da678a98eaa61e674c8ac50595607356d9 WHIRLPOOL 8bd93b8851cb8e3232b14c6da680579228623aad6814293a8e08c5ad3ed5d9bddf0b3e26aa05d94b8e3d96e26a067b74797e7227049baabe519f004ce7c7920b
+EBUILD devil-9999.ebuild 1546 SHA256 18781f6a18fa312ec62f02ddbd80c57c3381bb36fab659ff06c34cb5722d24d8 SHA512 385d0a117e0a9de10b51c6681cf7eb3c38210698f0b77df57aa4207a3f7e9207e4724d3d467c89b99bd035df648b81697f4149f26f512708bbe09a79e70c5a0b WHIRLPOOL c331362782b7e66b1896821d9c012e08a1052d3de4c96cecdf29490d3a54c313847cc4d0407371ad0a8c57964a40d2bca8a96f91f296c0e227a0fce0196b18dd
 MISC ChangeLog 798 SHA256 9d886f3729638a4977fc605a5493ac8c4cea03f94169c208151d0267cdb91b3a SHA512 1d19010a0fbbc1f04fb416ce10b82ef1ce5a9150fc613c23877f702eb12fb9cbefda82ffcfed4c18d99f0aa90b837cd00952278e5b26c7d9349d97c3e6076d03 WHIRLPOOL fe1775d6640c005c181a2a9684382ef8536fe305631eb798bc3372f0f352b89bc2efffff95439abdccbbba3d0b59b14f72bbe503d20ff0a5d1a9fd479f3bd8a9
-MISC metadata.xml 499 SHA256 d4cf93176bedb75d01c37dcd8d29a49fbfebfa7fd49f2dfcdf6cadb7365a7c39 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc WHIRLPOOL f83bbbadaf75bb031417c47910870f8529d60ef1bb06f2b7aa431d7878ca54486befcbc9020cc5ab2cba6d2512b883d3798e1425df445cdb794335e4d2a5096e
+MISC metadata.xml 358 SHA256 8d04739edd07d91c56dacea5657cb8fbde622c5aeaf73272ff8b377ff37501f6 SHA512 57ef858cbff75ce88ea72e1c41ef4289362d734cf1d04abd9b03228616ad021dda498e67401f255132bc6ad53cdac4a0aa2863dfbc23f3e4c90b8b137e65fcf2 WHIRLPOOL e2904218b3a581c20935933e5f2732d99377a17ec6383118da37f2253f7a40d1f4932dfcc1ab17bce9c0a1be65f629c17557dc4aa2f3c751dd0254d14555be26
diff --git a/media-libs/devil/devil-1.8.0.ebuild b/media-libs/devil/devil-1.8.0.ebuild
index d87703d..9a4b036 100644
--- a/media-libs/devil/devil-1.8.0.ebuild
+++ b/media-libs/devil/devil-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils cmake
+inherit cmake
 
 S=${WORKDIR}/DevIL-${PV}/DevIL/
 
@@ -14,15 +14,17 @@ SRC_URI="https://github.com/DentonW/DevIL/archive/v${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
+IUSE="lcms jpeg mng openexr opengl png sdl test tiff X xpm"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-install-paths.patch"
+)
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	allegro? ( media-libs/allegro:0 )
-	gif? ( media-libs/giflib:= )
-	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg )
 	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
 	openexr? ( media-libs/openexr:= )
 	opengl? ( virtual/opengl
 			virtual/glu )
@@ -39,38 +41,28 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_static="$(usex static-libs)"
-		--disable-lcms
-		--enable-ILU
-		--enable-ILUT
-		-DENABLE_sse="$(usex cpu_flags_x86_sse)"
-		-DENABLE_sse2="$(usex cpu_flags_x86_sse2)"
-		-DENABLE_sse3="$(usex cpu_flags_x86_sse3)"
-		-DENABLE_exr="$(usex openexr)"
-		-DENABLE_gif="$(usex gif)"
-		-DENABLE_jpeg="$(usex jpeg)"
-		--enable-jp2
-		-DENABLE_mng="$(usex mng)"
-		-DENABLE_png="$(usex png)"
-		-DENABLE_tiff="$(usex tiff)"
-		-DENABLE_xpm="$(usex xpm)"
-		-DENABLE_allegro="$(usex allegro)"
-		--disable-directx8
-		--disable-directx9
-		-DENABLE_opengl="$(usex opengl)"
-		-DENABLE_sdl="$(usex sdl)"
-		-DENABLE_x11="$(usex X)"
-		-DENABLE_shm="$(usex X)"
-		-DENABLE_render="$(usex X)"
-		-DENABLE_glut="$(usex glut)"
-		-DWITH_x="$(usex X)"
-		-DWITH_nvtt="$(usex nvtt)"
+		-DIL_MNG_LIB="$(usex mng)"
+		-DIL_NO_JPG="$(usex jpeg)"
+		-DIL_NO_LCMS="$(usex lcms)"
+		-DIL_NO_PNG="$(usex png)"
+		-DIL_NO_TIF="$(usex tiff)"
+		-DIL_USE_DXTC_SQUISH="false"
+		-DIL_TESTS="$(usex test)"
+		#-DIL_JASPER_LIB="$(usex jasper)"
+		#-DIL_JPEG_LIB="$(usex jpeg)"
+		#-DIL_LCMS2_LIB="$(usex lcms2)"
+		#-DIL_NVTT_LIB="$(usex nvtt)"
+		#-DIL_OPENEXR_LIB="$(usex openexr)"
+		#-DIL_PNG_LIB="$(usex png)"
+		#-DIL_SQUISH_LIB="false"
+		#-DIL_TIFF_LIB="$(usex tiff)"
+		-DLCMS_NODIRINCLUDE="true"
 	)
 	cmake_src_configure
 }
 
 src_install() {
-	default
+	cmake_src_install
 
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
diff --git a/media-libs/devil/devil-9999.ebuild b/media-libs/devil/devil-9999.ebuild
index dc2f678..2ff2fb0 100644
--- a/media-libs/devil/devil-9999.ebuild
+++ b/media-libs/devil/devil-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3 eutils cmake
+inherit git-r3 cmake
 
 S=${WORKDIR}/devil-${PV}/DevIL/
 
@@ -14,16 +14,17 @@ SRC_URI=""
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
+IUSE="lcms jpeg mng openexr opengl png sdl test tiff X xpm"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-install-paths.patch"
+)
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	allegro? ( media-libs/allegro:0 )
-	gif? ( media-libs/giflib:= )
-	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg )
 	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
 	openexr? ( media-libs/openexr:= )
 	opengl? ( virtual/opengl
 			virtual/glu )
@@ -40,38 +41,28 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_static="$(usex static-libs)"
-		--disable-lcms
-		--enable-ILU
-		--enable-ILUT
-		-DENABLE_sse="$(usex cpu_flags_x86_sse)"
-		-DENABLE_sse2="$(usex cpu_flags_x86_sse2)"
-		-DENABLE_sse3="$(usex cpu_flags_x86_sse3)"
-		-DENABLE_exr="$(usex openexr)"
-		-DENABLE_gif="$(usex gif)"
-		-DENABLE_jpeg="$(usex jpeg)"
-		--enable-jp2
-		-DENABLE_mng="$(usex mng)"
-		-DENABLE_png="$(usex png)"
-		-DENABLE_tiff="$(usex tiff)"
-		-DENABLE_xpm="$(usex xpm)"
-		-DENABLE_allegro="$(usex allegro)"
-		--disable-directx8
-		--disable-directx9
-		-DENABLE_opengl="$(usex opengl)"
-		-DENABLE_sdl="$(usex sdl)"
-		-DENABLE_x11="$(usex X)"
-		-DENABLE_shm="$(usex X)"
-		-DENABLE_render="$(usex X)"
-		-DENABLE_glut="$(usex glut)"
-		-DWITH_x="$(usex X)"
-		-DWITH_nvtt="$(usex nvtt)"
+		-DIL_MNG_LIB="$(usex mng)"
+		-DIL_NO_JPG="$(usex jpeg)"
+		-DIL_NO_LCMS="$(usex lcms)"
+		-DIL_NO_PNG="$(usex png)"
+		-DIL_NO_TIF="$(usex tiff)"
+		-DIL_USE_DXTC_SQUISH="false"
+		-DIL_TESTS="$(usex test)"
+		#-DIL_JASPER_LIB="$(usex jasper)"
+		#-DIL_JPEG_LIB="$(usex jpeg)"
+		#-DIL_LCMS2_LIB="$(usex lcms2)"
+		#-DIL_NVTT_LIB="$(usex nvtt)"
+		#-DIL_OPENEXR_LIB="$(usex openexr)"
+		#-DIL_PNG_LIB="$(usex png)"
+		#-DIL_SQUISH_LIB="false"
+		#-DIL_TIFF_LIB="$(usex tiff)"
+		-DLCMS_NODIRINCLUDE="true"
 	)
 	cmake_src_configure
 }
 
 src_install() {
-	default
+	cmake_src_install
 
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
diff --git a/media-libs/devil/files/devil-1.8.0-cmake-install-paths.patch b/media-libs/devil/files/devil-1.8.0-cmake-install-paths.patch
new file mode 100644
index 0000000..103565f
--- /dev/null
+++ b/media-libs/devil/files/devil-1.8.0-cmake-install-paths.patch
@@ -0,0 +1,83 @@
+diff -r --unified a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
+--- a/src-IL/CMakeLists.txt	2023-02-26 22:14:14.468289653 +0100
++++ b/src-IL/CMakeLists.txt	2023-02-26 22:39:57.848451049 +0100
+@@ -2,6 +2,7 @@
+ project(DevIL)
+ 
+ include (TestBigEndian)
++include (GNUInstallDirs)
+ 
+ option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
+ 
+@@ -311,11 +312,11 @@
+ 
+ # Installation
+ install (TARGETS IL
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/il.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/il.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/IL.pc
+diff -r --unified a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
+--- a/src-ILU/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
++++ b/src-ILU/CMakeLists.txt	2023-02-26 22:42:30.253560617 +0100
+@@ -2,6 +2,8 @@
+ 
+ project(ILU)
+ 
++include (GNUInstallDirs)
++
+ file(GLOB ILU_SRCS src/*.cpp)
+ file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h)
+ file(GLOB ILU_RSRC)
+@@ -75,11 +77,11 @@
+ 
+ # Installation
+ install (TARGETS ILU
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/ilu.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc
+diff -r --unified a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
+--- a/src-ILUT/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
++++ b/src-ILUT/CMakeLists.txt	2023-02-26 22:43:27.677989601 +0100
+@@ -2,6 +2,8 @@
+ 
+ project(ILUT)
+ 
++include (GNUInstallDirs)
++
+ file(GLOB ILUT_SRCS src/*.cpp)
+ file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h)
+ file(GLOB ILUT_RSRC)
+@@ -95,11 +97,11 @@
+ 
+ # Installation
+ install (TARGETS ILUT
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/ilut.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc
diff --git a/media-libs/devil/files/devil-9999-cmake-install-paths.patch b/media-libs/devil/files/devil-9999-cmake-install-paths.patch
new file mode 100644
index 0000000..103565f
--- /dev/null
+++ b/media-libs/devil/files/devil-9999-cmake-install-paths.patch
@@ -0,0 +1,83 @@
+diff -r --unified a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
+--- a/src-IL/CMakeLists.txt	2023-02-26 22:14:14.468289653 +0100
++++ b/src-IL/CMakeLists.txt	2023-02-26 22:39:57.848451049 +0100
+@@ -2,6 +2,7 @@
+ project(DevIL)
+ 
+ include (TestBigEndian)
++include (GNUInstallDirs)
+ 
+ option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
+ 
+@@ -311,11 +312,11 @@
+ 
+ # Installation
+ install (TARGETS IL
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/il.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/il.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/IL.pc
+diff -r --unified a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
+--- a/src-ILU/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
++++ b/src-ILU/CMakeLists.txt	2023-02-26 22:42:30.253560617 +0100
+@@ -2,6 +2,8 @@
+ 
+ project(ILU)
+ 
++include (GNUInstallDirs)
++
+ file(GLOB ILU_SRCS src/*.cpp)
+ file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h)
+ file(GLOB ILU_RSRC)
+@@ -75,11 +77,11 @@
+ 
+ # Installation
+ install (TARGETS ILU
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/ilu.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc
+diff -r --unified a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
+--- a/src-ILUT/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
++++ b/src-ILUT/CMakeLists.txt	2023-02-26 22:43:27.677989601 +0100
+@@ -2,6 +2,8 @@
+ 
+ project(ILUT)
+ 
++include (GNUInstallDirs)
++
+ file(GLOB ILUT_SRCS src/*.cpp)
+ file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h)
+ file(GLOB ILUT_RSRC)
+@@ -95,11 +97,11 @@
+ 
+ # Installation
+ install (TARGETS ILUT
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-install (FILES ../include/IL/ilut.h DESTINATION include/IL)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc