Files
MINGW-packages/mingw-w64-libssh/mingw-DATADIR-conflict.patch
2018-08-21 15:50:01 +03:00

25 lines
1.0 KiB
Diff

diff -Naur libssh-0.8.1.orig/config.h.cmake libssh-0.8.1/config.h.cmake
--- libssh-0.8.1.orig/config.h.cmake 2018-08-21 08:30:18.361515500 -0400
+++ libssh-0.8.1/config.h.cmake 2018-08-21 08:39:31.704597800 -0400
@@ -5,7 +5,7 @@
#cmakedefine VERSION "${PROJECT_VERSION}"
#cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
-#cmakedefine DATADIR "${DATADIR}"
+#cmakedefine DATA_DIR "${DATA_DIR}"
#cmakedefine LIBDIR "${LIBDIR}"
#cmakedefine PLUGINDIR "${PLUGINDIR}"
#cmakedefine SYSCONFDIR "${SYSCONFDIR}"
diff -Naur libssh-0.8.1.orig/ConfigureChecks.cmake libssh-0.8.1/ConfigureChecks.cmake
--- libssh-0.8.1.orig/ConfigureChecks.cmake 2018-08-21 08:30:18.361515500 -0400
+++ libssh-0.8.1/ConfigureChecks.cmake 2018-08-21 08:39:55.719325200 -0400
@@ -9,7 +9,7 @@
set(PACKAGE ${PROJECT_NAME})
set(VERSION ${PROJECT_VERSION})
-set(DATADIR ${DATA_INSTALL_DIR})
+set(DATA_DIR ${DATA_INSTALL_DIR})
set(LIBDIR ${LIB_INSTALL_DIR})
set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})