diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-08 09:35:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-08 09:35:00 +0200 |
| commit | dbda20caffbb22115b6f30069b716bc505c49d11 (patch) | |
| tree | 5bc65ef535e3fbde4e5cef4115054d70465d8ed6 /support-files | |
| parent | 9329467e7941c6cc4b3a266ac2fc6ec4254eaf46 (diff) | |
| download | mariadb-git-dbda20caffbb22115b6f30069b716bc505c49d11.tar.gz | |
remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | support-files/mariadb.pc.in | 23 |
2 files changed, 0 insertions, 26 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index c974b7cb7dd..4677bd59415 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -70,9 +70,6 @@ IF(UNIX) INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) 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 mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) diff --git a/support-files/mariadb.pc.in b/support-files/mariadb.pc.in deleted file mode 100644 index bc84a5c5c4c..00000000000 --- a/support-files/mariadb.pc.in +++ /dev/null @@ -1,23 +0,0 @@ -# these four variables are present in almost every .pc file -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=${prefix}/@INSTALL_LIBDIR@ -includedir=${prefix}/@INSTALL_INCLUDEDIR@ -# those are rarely present or not at all, but we export them regardless -bindir=${prefix}/@INSTALL_BINDIR@ -sbindir=${prefix}/@INSTALL_SBINDIR@ -scriptdir=${prefix}/@INSTALL_SCRIPTDIR@ -plugindir=${prefix}/@INSTALL_PLUGINDIR@ -docdir=${prefix}/@INSTALL_DOCDIR@ -mandir=${prefix}/@INSTALL_MANDIR@ -sharedir=${prefix}/@INSTALL_SHAREDIR@ -mysqlsharedir=${prefix}/@INSTALL_MYSQLSHAREDIR@ -mysqltestdir=${prefix}/@INSTALL_MYSQLTESTDIR@ -socket=@INSTALL_UNIX_ADDRDIR@ - -Name: @CPACK_PACKAGE_NAME@ -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@ |