From: Sam James <sam@gentoo.org>
Date: Sat, 20 Aug 2022 01:52:16 +0000 (+0100)
Subject: Fix respecting LOCALDIR and COOKIEDIR
X-Git-Tag: fortune-mod-3.16.0~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18d3021cc85efd7002eb79cb7ffe139993ebdb4c;p=fortune-mod

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 8908435..55cd235 100644
--- 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 8a87044..f6dc2b1 100644
--- 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}"
 )