Merge branch 'master' into switch-to-gpgk
authorWerner Koch <wk@gnupg.org>
Mon, 18 Mar 2019 18:41:07 +0000 (19:41 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 18 Mar 2019 18:41:07 +0000 (19:41 +0100)
--

1  2 
configure.ac
po/Makevars

diff --cc configure.ac
@@@ -505,8 -508,8 +508,9 @@@ AH_BOTTOM(
  #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
  #endif
  #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 +#define GNUPG_PUBLIC_KEYS_DIR   "public-keys.d"
  #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
+ #define GNUPG_CACHE_DIR         "cache.d"
  
  #define GNUPG_DEF_COPYRIGHT_LINE \
          "Copyright (C) 2018 Free Software Foundation, Inc."
diff --cc po/Makevars
Simple merge