From: Sebastian Ramacher <sramacher@debian.org>
Date: Tue, 21 Jul 2020 19:56:20 +0000 (+0200)
Subject: Install plugins in /usr/lib
X-Git-Tag: archive/raspbian/3.6.3+dfsg-1+rpi1~1^2^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2e524b90b83e6bd6045cedd66ff3851faa5730e;p=audacity.git

Install plugins in /usr/lib


Gbp-Pq: Name 0005-Install-plugins-in-usr-lib.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff54304..40c36180 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,7 +380,7 @@ set( _PREFIX "${CMAKE_INSTALL_PREFIX}" )
 set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}/audacity" )
 set( _RPATH "\$ORIGIN/../${_LIBDIR}" )
 set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
-set( _PKGDATA "${_DATADIR}/audacity/" )
+set( _PKGDATA "${_LIBDIR}" )
 set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
 
 # Precreate the lib and lib64 directories so we can make then the same
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 661ab7e0..3c29ac70 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1183,6 +1183,9 @@ bool AudacityApp::OnInit()
    FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.%s-files"),
       home, wxT(AUDACITY_NAME)),
       audacityPathList);
+   FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/lib/%s"),
+      wxT(INSTALL_PREFIX), wxT(AUDACITY_NAME)),
+      audacityPathList);
    FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/%s"),
       wxT(INSTALL_PREFIX), wxT(AUDACITY_NAME)),
       audacityPathList);
@@ -1193,6 +1196,9 @@ bool AudacityApp::OnInit()
    FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.audacity-files"),
       home),
       audacityPathList)
+   FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/lib/audacity"),
+      wxT(INSTALL_PREFIX)),
+      audacityPathList);
    FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/audacity"),
       wxT(INSTALL_PREFIX)),
       audacityPathList);