diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 13:27:10 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 13:27:10 +0100 |
| commit | b8c0e4967098fa40094229775e3560fa9052005e (patch) | |
| tree | d2b4f2914776aaecbbc5d3d4aba0c826f8f3b49e /support-files | |
| parent | 5c6c4b13952b0b832b3480bbb1cc9c9889244d33 (diff) | |
| parent | 440452628d95476674922c6c097825509a002d8d (diff) | |
| download | mariadb-git-b8c0e4967098fa40094229775e3560fa9052005e.tar.gz | |
Merge commit '10.3' into 10.4
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support-files/mariadb.pc.in | 2 | ||||
| -rw-r--r-- | support-files/mariadb.service.in | 2 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index a9f1bf64da8..80b6ca386df 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -91,7 +91,7 @@ IF(UNIX) ENDIF() CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development) INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) diff --git a/support-files/mariadb.pc.in b/support-files/mariadb.pc.in index bc84a5c5c4c..7d321f28491 100644 --- a/support-files/mariadb.pc.in +++ b/support-files/mariadb.pc.in @@ -20,4 +20,4 @@ Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@ URL: @CPACK_PACKAGE_URL@ Version: @VERSION@ Libs: -L${libdir} @LIBS_FOR_CLIENTS@ -Cflags: -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@ +Cflags: -I${includedir} @CFLAGS_FOR_CLIENTS@ diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index e7665ed1219..dca7a4c13a7 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -144,7 +144,7 @@ TimeoutStopSec=900 ## isn't executed. ## -# Number of files limit. previously [mysqld_safe] open-file-limit +# Number of files limit. previously [mysqld_safe] open-files-limit LimitNOFILE=16364 # Maximium core size. previously [mysqld_safe] core-file-size diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index ffefc2f22d8..f12f44311f5 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -267,7 +267,7 @@ Group=mysql ## isn't executed. ## -# Number of files limit. previously [mysqld_safe] open-file-limit +# Number of files limit. previously [mysqld_safe] open-files-limit LimitNOFILE=16364 # Maximium core size. previously [mysqld_safe] core-file-size |