Changeset View
Changeset View
Standalone View
Standalone View
head/sysutils/lizardfs/files/patch-CMakeLists.txt
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- CMakeLists.txt.orig 2017-12-20 09:59:37 UTC | |||||
| +++ CMakeLists.txt | |||||
| @@ -167,13 +167,7 @@ if(ENABLE_TESTS AND NOT THROW_INSTEAD_OF_ABORT) | |||||
| message(STATUS "THROW_INSTEAD_OF_ABORT: ${THROW_INSTEAD_OF_ABORT}") | |||||
| endif() | |||||
| -get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) | |||||
| -if (LIB64) | |||||
| - set(LIBSUFFIX "64") | |||||
| -else() | |||||
| - set(LIBSUFFIX "") | |||||
| -endif() | |||||
| -message(STATUS "LIB64: ${LIB64}") | |||||
| +set(LIBSUFFIX "") | |||||
| if(ENABLE_DEBIAN_PATHS) | |||||
| if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/") | |||||
| @@ -193,9 +187,9 @@ else() | |||||
| set(SBIN_SUBDIR "sbin") | |||||
| set(LIB_SUBDIR "lib${LIBSUFFIX}") | |||||
| set(ETC_SUBDIR "etc/mfs") | |||||
| - set(RUN_SUBDIR "var/run/mfs") | |||||
| - set(DATA_SUBDIR "var/lib/mfs") | |||||
| - set(MAN_SUBDIR "share/man") | |||||
| + set(RUN_SUBDIR "/var/run/mfs") | |||||
| + set(DATA_SUBDIR "/var/mfs") | |||||
| + set(MAN_SUBDIR "man") | |||||
| set(CGI_SUBDIR "share/mfscgi") | |||||
| set(INCL_SUBDIR "include/lizardfs") | |||||
| endif() | |||||
| @@ -205,8 +199,6 @@ set(BIN_PATH ${INSTALL_PREFIX_NO_SLASH}/${BIN_SUBDIR | |||||
| set(SBIN_PATH ${INSTALL_PREFIX_NO_SLASH}/${SBIN_SUBDIR}) | |||||
| set(LIB_PATH ${INSTALL_PREFIX_NO_SLASH}/${LIB_SUBDIR}) | |||||
| set(ETC_PATH ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR}) | |||||
| -set(RUN_PATH ${INSTALL_PREFIX_NO_SLASH}/${RUN_SUBDIR}) | |||||
| -set(DATA_PATH ${INSTALL_PREFIX_NO_SLASH}/${DATA_SUBDIR}) | |||||
| set(MAN_PATH ${INSTALL_PREFIX_NO_SLASH}/${MAN_SUBDIR}) | |||||
| set(CGI_PATH ${INSTALL_PREFIX_NO_SLASH}/${CGI_SUBDIR}) | |||||
| set(INCL_PATH ${INSTALL_PREFIX_NO_SLASH}/${INCL_SUBDIR}) | |||||