Strip CMAKE_INSTALL_LIBDIR and others from %cmake macro (bug 795542)

2012-02-21 15:27:33 -07:00 · 2012-02-21 15:27:33 -07:00 · 2273177e80
commit 2273177e80
parent e9e494137f
2 changed files with 4 additions and 9 deletions
--- a/cmake.spec
+++ b/cmake.spec
@ -8,7 +8,7 @@

 Name:           cmake
 Version:        2.8.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Cross-platform make system

 Group:          Development/Tools
@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :


 %changelog
+* Tue Feb 21 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-5
+- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542)
+
 * Thu Jan 26 2012 Tomas Bzatek <tbzatek@redhat.com> - 2.8.7-4
 - Rebuilt for new libarchive

--- a/macros.cmake
+++ b/macros.cmake
@ -14,12 +14,4 @@
  %__cmake \\\
        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-        -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-%if "%{?_lib}" == "lib64" \
-        %{?_cmake_lib_suffix64} \\\
-%endif \
        -DBUILD_SHARED_LIBS:BOOL=ON