Make LIB_INSTALL_DIR relative so that CMake does not generate /usr/usr/lib/...

11 years ago · ce2b66e0cf
parent 0ba3d064aa
commit ce2b66e0cf
3 changed files with 6 additions and 3 deletions
--- a/kf5.spec
+++ b/kf5.spec
@ -1,6 +1,6 @@
 Name:           kf5
 Version:        4.99.0
-Release:        3
+Release:        4
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
 BuildArch:      noarch
 License:        BSD
@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d


 %changelog
+* Wed May 14 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-4
+- Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake
+
 * Tue May 06 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-3
 - Define KF5_INCLUDE_INSTALL_DIR

--- a/macros.kf5
+++ b/macros.kf5
@ -28,7 +28,7 @@
    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
    -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\
    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-    -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\
+    -DLIB_INSTALL_DIR:PATH=%{_lib} \\\
 %if "%{?_lib}" == "lib64" \
     %{?_cmake_lib_suffix64} \\\
 %endif \
--- a/2
+++ b/2
@ -1 +1 @@
-ebe50627bd3a4a03037ae311b19a9c23  macros.kf5
+e6b17285db08eb7baafd6405e8b500e8  macros.kf5