From 51d0676a35540075910fa357e1ec90aa8301f813 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Jun 05 2023 18:00:38 +0000
Subject: Move clang-resource-dir to /usr/lib


---

diff --git a/clang.spec b/clang.spec
index 9321cca..d177972 100644
--- a/clang.spec
+++ b/clang.spec
@@ -417,6 +417,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \
+	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
 %ifarch %{arm}
 	-DCLANG_DEFAULT_LINKER=lld \
 %endif
@@ -497,7 +498,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 
 # Create sub-directories in the clang resource directory that will be
 # populated by other packages
-mkdir -p %{buildroot}%{pkg_libdir}/clang/%{maj_ver}/{include,lib,share}/
+mkdir -p %{buildroot}%{install_prefix}/lib/clang/%{maj_ver}/{include,lib,share}/
 
 
 %if %{without compat_build}
@@ -541,11 +542,11 @@ false
 
 %files libs
 %if %{without compat_build}
-%{_libdir}/clang/%{maj_ver}/include/*
+%{install_prefix}/lib/clang/%{maj_ver}/include/*
 %{_libdir}/*.so.*
 %else
 %{pkg_libdir}/*.so.*
-%{pkg_libdir}/clang/%{maj_ver}/include/*
+%{install_prefix}/lib//clang/%{maj_ver}/include/*
 %endif
 
 %files devel
@@ -565,10 +566,11 @@ false
 %endif
 
 %files resource-filesystem
-%dir %{pkg_libdir}/clang/%{maj_ver}/
-%dir %{pkg_libdir}/clang/%{maj_ver}/include/
-%dir %{pkg_libdir}/clang/%{maj_ver}/lib/
-%dir %{pkg_libdir}/clang/%{maj_ver}/share/
+%dir %{install_prefix}/lib/clang/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/include/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/share/
 
 %if %{without compat_build}
 %files analyzer
diff --git a/macros.clang b/macros.clang
index 1f26e35..b8d9c60 100644
--- a/macros.clang
+++ b/macros.clang
@@ -8,9 +8,9 @@
 # headers and libraries.  This path should be used by packages that need to
 # install files into this directory.  This macro's value changes every time
 # clang's version changes.
-%clang_resource_dir %{_libdir}/clang/%{clang_version}
+%clang_resource_dir %{_prefix}/lib/clang/%{clang_major_version}
 
 # This is the path to the clang resource directory that should be used
 # by packages that need to read files from this directory at runtime.
 # This macro only changes when clang's major version changes.
-%clang_resource_dir_readonly %{_libdir}/clang/%{clang_major_version}
+%clang_resource_dir_readonly %{_prefix}/lib/clang/%{clang_major_version}