rpms/cmake/F-7 cmake.spec,1.15,1.16 macros.cmake,1.1,1.2

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/cmake/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14291

Modified Files:
	cmake.spec macros.cmake 
Log Message:
- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR,
  LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-7/cmake.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cmake.spec	16 Apr 2007 16:29:59 -0000	1.15
+++ cmake.spec	24 Jul 2007 21:44:54 -0000	1.16
@@ -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 @@
 
 
 %changelog
+* Tue Jul 24 2007 Orion Poplawski <orion at cora.nwra.com> - 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 <orion at cora.nwra.com> - 2.4.6-3
 - Apply patch from upstream CVS to fix .so install permissions (bug #235673)
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-7/macros.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- macros.cmake	6 Apr 2007 16:56:30 -0000	1.1
+++ macros.cmake	24 Jul 2007 21:44:54 -0000	1.2
@@ -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