Fix respecting LOCALDIR and COOKIEDIR

The intention of LOCALDIR seems to be to allow local cookies to be
provided by the sysadmin in e.g. /usr/local/share/fortune,
but if set, before this patch, even cookies distributed
by upstream were stored there (and nothing in COOKIEDIR, e.g.
/usr/share/fortune - https://bugs.gentoo.org/865809).

Originally, we were setting LOCALDIR=COOKIEDIR=/usr/share/fortune to
workaround the issue, but see https://bugs.gentoo.org/857246.

Signed-off-by: Sam James <sam@gentoo.org>

diff --git a/fortune-mod/datfiles/CMakeLists.txt b/fortune-mod/datfiles/CMakeLists.txt
index 89084352f9ec48a66a1bb4a7826bb7e455ae0a8a..55cd235552611becc2a997fbdb7edf0d6f02efbe 100644 (file)
--- a/fortune-mod/datfiles/CMakeLists.txt
+++ b/fortune-mod/datfiles/CMakeLists.txt
@@ -68,7 +68,7 @@ ADD_CUSTOM_TARGET(
 )
 INSTALL(
     FILES ${_install_unrot_cookies}
-    DESTINATION "${LOCALDIR}"
+    DESTINATION "${COOKIEDIR}"
 )
 
 IF (NOT NO_OFFENSIVE)

diff --git a/fortune-mod/datfiles/off/CMakeLists.txt b/fortune-mod/datfiles/off/CMakeLists.txt
index 8a870444ce52f92e925013f9a3029d7589660978..f6dc2b16cbbaa134f5a53acb925aabe37c7b8062 100644 (file)
--- a/fortune-mod/datfiles/off/CMakeLists.txt
+++ b/fortune-mod/datfiles/off/CMakeLists.txt
@@ -54,5 +54,5 @@ ADD_CUSTOM_TARGET(
 )
 INSTALL(
     FILES ${_install_rotated_cookies}
-    DESTINATION "${LOCALODIR}"
+    DESTINATION "${OCOOKIEDIR}"
 )