21 lines
1.3 KiB
Diff
21 lines
1.3 KiB
Diff
|
--- nfs-ganesha-2.3-rc5/src/CMakeLists.txt.orig 2015-10-05 07:32:38.294664072 -0400
|
||
|
|
+++ nfs-ganesha-2.3-rc5/src/CMakeLists.txt 2015-10-08 14:20:40.238664072 -0400
|
||
|
|
@@ -20,7 +20,7 @@
|
||
|
|
set(GANESHA_MINOR_VERSION 3)
|
||
|
|
|
||
|
|
# needs to come after project()
|
||
|
|
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||
|
|
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR CMAKE_INSTALL_PREFIX STREQUAL "/usr")
|
||
|
|
SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix for common files" FORCE)
|
||
|
|
message(STATUS "override default CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
|
||
|
|
SET(SYSCONFDIR "/etc" CACHE PATH "Install prefix for common files" FORCE)
|
||
|
|
@@ -29,7 +29,7 @@
|
||
|
|
message(STATUS "was set CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
|
||
|
|
SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Install prefix for common files" FORCE)
|
||
|
|
SET(SYSSTATEDIR "${CMAKE_INSTALL_PREFIX}/var" CACHE PATH "Install prefix for common files" FORCE)
|
||
|
|
-ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||
|
|
+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR CMAKE_INSTALL_PREFIX STREQUAL "/usr")
|
||
|
|
# Patch level is always ".0" for mainline (master). It is blank for development.
|
||
|
|
# When starting a stable maintenance branch, this becomes ".N"
|
||
|
|
# where N is monotonically increasing starting at 1. Remember to include the "." !!
|