From 99d8ca882a893f2e31f0841127bfaa4c252324df Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Jul 2007 21:44:54 +0000 Subject: [PATCH] - Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX --- cmake.spec | 6 +++++- macros.cmake | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 60a0386..844cdc2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,6 +1,6 @@ Name: cmake Version: 2.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -73,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 24 2007 Orion Poplawski - 2.4.6-4 +- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR, + LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX + * Mon Apr 16 2007 Orion Poplawski - 2.4.6-3 - Apply patch from upstream CVS to fix .so install permissions (bug #235673) diff --git a/macros.cmake b/macros.cmake index 6e06ad0..6d31bf1 100644 --- a/macros.cmake +++ b/macros.cmake @@ -9,8 +9,13 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ %__cmake \\\ + -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 \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DBUILD_SHARED_LIBS:BOOL=ON