blob: 860f7f1d9699300e6449789211482901166cf00f [file] [log] [blame]
Brad Bishopa5c52ff2018-11-23 10:55:50 +13001From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 19 Sep 2018 14:44:40 +0100
4Subject: [PATCH] Allow the environment to override where gnupg looks for its
5 own files. Useful in native builds.
Brad Bishopc4ea0752018-11-15 14:30:15 -08006
7Upstream-Status: Inappropriate [OE-specific]
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
Brad Bishopa5c52ff2018-11-23 10:55:50 +130010---
11 common/homedir.c | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-)
13
Brad Bishopc4ea0752018-11-15 14:30:15 -080014diff --git a/common/homedir.c b/common/homedir.c
Brad Bishopa5c52ff2018-11-23 10:55:50 +130015index e9e75d0..19140aa 100644
Brad Bishopc4ea0752018-11-15 14:30:15 -080016--- a/common/homedir.c
17+++ b/common/homedir.c
18@@ -760,7 +760,7 @@ gnupg_socketdir (void)
19 if (!name)
20 {
21 unsigned int dummy;
22- name = _gnupg_socketdir_internal (0, &dummy);
23+ name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy);
24 }
25
26 return name;
27@@ -786,7 +786,7 @@ gnupg_sysconfdir (void)
28 }
29 return name;
30 #else /*!HAVE_W32_SYSTEM*/
31- return GNUPG_SYSCONFDIR;
32+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR;
33 #endif /*!HAVE_W32_SYSTEM*/
34 }
35
36@@ -815,7 +815,7 @@ gnupg_bindir (void)
37 else
38 return rdir;
39 #else /*!HAVE_W32_SYSTEM*/
40- return GNUPG_BINDIR;
41+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR;
42 #endif /*!HAVE_W32_SYSTEM*/
43 }
44
45@@ -828,7 +828,7 @@ gnupg_libexecdir (void)
46 #ifdef HAVE_W32_SYSTEM
47 return gnupg_bindir ();
48 #else /*!HAVE_W32_SYSTEM*/
49- return GNUPG_LIBEXECDIR;
50+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR;
51 #endif /*!HAVE_W32_SYSTEM*/
52 }
53
54@@ -842,7 +842,7 @@ gnupg_libdir (void)
55 name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
56 return name;
57 #else /*!HAVE_W32_SYSTEM*/
58- return GNUPG_LIBDIR;
59+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR;
60 #endif /*!HAVE_W32_SYSTEM*/
61 }
62
63@@ -856,7 +856,7 @@ gnupg_datadir (void)
64 name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL);
65 return name;
66 #else /*!HAVE_W32_SYSTEM*/
67- return GNUPG_DATADIR;
68+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR;
69 #endif /*!HAVE_W32_SYSTEM*/
70 }
71
72@@ -872,7 +872,7 @@ gnupg_localedir (void)
73 NULL);
74 return name;
75 #else /*!HAVE_W32_SYSTEM*/
76- return LOCALEDIR;
77+ return getenv("LOCALEDIR") ?: LOCALEDIR;
78 #endif /*!HAVE_W32_SYSTEM*/
79 }
80
81@@ -940,7 +940,7 @@ gnupg_cachedir (void)
82 }
83 return dir;
84 #else /*!HAVE_W32_SYSTEM*/
85- return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
86+ return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
87 #endif /*!HAVE_W32_SYSTEM*/
88 }
89