Browse Source

Update galera file paths, so they don't conflict with other galera packages (#1705)

Sergey Nikolaev 2 years ago
parent
commit
4dac7d657d
2 changed files with 8 additions and 16 deletions
  1. 4 8
      galera_packaging/CommonDeb.cmake
  2. 4 8
      galera_packaging/CommonRpm.cmake

+ 4 - 8
galera_packaging/CommonDeb.cmake

@@ -17,16 +17,12 @@ include ( GNUInstallDirs )
 
 install ( TARGETS galera LIBRARY DESTINATION ${CMAKE_INSTALL_DATADIR}/manticore/modules )
 
-#fixup - CMAKE_INSTALL_DOCDIR is share/doc/GALERA, fixup to share/doc/galera-4
-set ( CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/galera-4" )
+#fixup - CMAKE_INSTALL_DOCDIR is share/doc/GALERA, fixup to share/doc/manticore-galera
+set ( CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/manticore-galera" )
 GNUInstallDirs_get_absolute_install_dir ( CMAKE_INSTALL_FULL_DOCDIR CMAKE_INSTALL_DOCDIR DOCDIR )
 
-#/usr/share/doc/galera-4/AUTHORS - no changes (AUTHORS)
-#/usr/share/doc/galera-4/README.gz - no changes (README)
-#/usr/share/doc/galera-4/changelog.Debian.gz - no changes (packages/debian/changelog)
-#/usr/share/doc/galera-4/copyright - no changes (debian/copyright)
-# see https://github.com/manticoresoftware/dev/issues/416 for details
+# see https://github.com/manticoresoftware/dev/issues/416#issuecomment-1807560203 for details
 
 install ( FILES AUTHORS README packages/debian/changelog debian/copyright DESTINATION ${CMAKE_INSTALL_DOCDIR} )
 
-# set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
+# set(CPACK_DEBIAN_PACKAGE_DEBUG ON)

+ 4 - 8
galera_packaging/CommonRpm.cmake

@@ -24,15 +24,11 @@ include ( GNUInstallDirs )
 
 install ( TARGETS galera LIBRARY DESTINATION ${CMAKE_INSTALL_DATADIR}/manticore/modules )
 
-#fixup - CMAKE_INSTALL_DOCDIR is share/doc/GALERA, fixup to share/doc/galera
-set ( CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/galera" )
+#fixup - CMAKE_INSTALL_DOCDIR is share/doc/GALERA, fixup to share/doc/manticore-galera
+set ( CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/manticore-galera" )
 GNUInstallDirs_get_absolute_install_dir ( CMAKE_INSTALL_FULL_DOCDIR CMAKE_INSTALL_DOCDIR DOCDIR )
 
-# /usr/share/doc/galera/AUTHORS - no changes (AUTHORS)
-# /usr/share/doc/galera/COPYING - no changes (COPYING)
-# /usr/share/doc/galera/LICENSE.asio - no changes (`asio/LICENSE_1_0.txt)
-# /usr/share/doc/galera/README - no changes (README)
-# see https://github.com/manticoresoftware/dev/issues/416 for details
+# see https://github.com/manticoresoftware/dev/issues/416#issuecomment-1807560203 for details
 
 install ( FILES AUTHORS COPYING README DESTINATION ${CMAKE_INSTALL_DOCDIR} )
-install ( FILES asio/LICENSE_1_0.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "LICENSE.asio" )
+install ( FILES asio/LICENSE_1_0.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "LICENSE.asio" )