diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-07 16:21:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-07 16:21:53 +0200 |
| commit | e73e1e7c7ac04295571a2f54872cacb2d580f4ae (patch) | |
| tree | b6bff25c20db5f825f00e9ca98c5b163517d51fd | |
| parent | fc58ba6c76ef752e859146fefc9e6fbc564ab900 (diff) | |
| download | mariadb-git-e73e1e7c7ac04295571a2f54872cacb2d580f4ae.tar.gz | |
packaging issues:
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
(and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rw-r--r-- | support-files/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/00list b/debian/patches/00list index 77c159a17ed..943980cdcea 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -5,7 +5,7 @@ 33_scripts__mysql_create_system_tables__no_test.dpatch 38_scripts__mysqld_safe.sh__signals.dpatch 41_scripts__mysql_install_db.sh__no_test.dpatch -44_scripts__mysql_config__libs.dpatch +# 44_scripts__mysql_config__libs.dpatch 50_mysql-test__db_test.dpatch # 60_zlib_innodb_workaround.dpatch 61_replace_dash_with_bash_mbug675185.dpatch diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 0f1855c66ca..c974b7cb7dd 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -71,7 +71,7 @@ IF(UNIX) ENDIF() CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) + 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) |