From: Jonathan Lebon <jlebon@redhat.com>
Date: Fri, 3 Feb 2017 19:10:27 +0000 (-0500)
Subject: trusted.gpg.d: keep in the same location
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~40^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0400df75d13d103dd63d7a4ab0b3f17f4bd2f1c9;p=ostree.git

trusted.gpg.d: keep in the same location

With the package rename from ostree to libostree, the trusted.gpg.d/ dir
changed install location from /usr/share/ostree to /usr/share/libostree.
Let's keep the same dir to remain compatible with existing installations
that may already have keys there.

Closes: #668
Approved by: cgwalters
---

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index fceb846c..63f0eb7d 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -206,7 +206,7 @@ endif
 pkgconfig_DATA += src/libostree/ostree-1.pc
 
 gpgreadme_DATA = src/libostree/README-gpg
-gpgreadmedir = $(pkgdatadir)/trusted.gpg.d
+gpgreadmedir = $(datadir)/ostree/trusted.gpg.d
 EXTRA_DIST += src/libostree/README-gpg src/libostree/bupsplit.h \
 		src/libostree/ostree-enumtypes.h.template \
 		src/libostree/ostree-enumtypes.c.template \