File cassandane-set-libexecdir.patch of Package cyrus-imapd
--- a/Cassandane/Instance.pm 2020-07-25 10:41:19.000000000 +0200
+++ b/Cassandane/Instance.pm 2020-07-30 16:22:43.618084012 +0200
@@ -174,7 +174,7 @@
'destdir', '');
my $cyrus_master;
- foreach my $d (qw( bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
+ foreach my $d (qw( lib/cyrus/bin libexec/cyrus/bin bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
{
my $try = "$cyrus_destdir$cyrus_prefix/$d/master";
if (-x $try) {
@@ -475,7 +475,7 @@
return $name if $name =~ m/^\//;
my $base = $self->{cyrus_destdir} . $self->{cyrus_prefix};
- foreach (qw( bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
+ foreach (qw( lib/cyrus/bin libexec/cyrus/bin bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))
{
my $dir = "$base/$_";
if (opendir my $dh, $dir)
--- a/Cassandane/BuildInfo.pm 2020-07-25 10:41:19.000000000 +0200
+++ b/Cassandane/BuildInfo.pm 2020-07-30 16:31:50.171425002 +0200
@@ -69,7 +69,7 @@
my ($destdir, $prefix) = @_;
my $cyr_buildinfo;
- foreach my $bindir (qw(sbin cyrus/bin)) {
+ foreach my $bindir (qw(lib/cyrus/bin libexec/cyrus/bin sbin cyrus/bin)) {
my $p = "$destdir$prefix/$bindir/cyr_buildinfo";
if (-x $p) {
$cyr_buildinfo = $p;