Install plugins in /usr/lib

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff5430494e76d7139a37a06d75ce8ca3a7d8685..40c361803ddf829cbbaa88b126becbc67cc5baf3 100644 (file)
--- 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 661ab7e0a9d4a283c757d47a9577d9dcd10c0bec..3c29ac70dfc6c5240c9a1079bc5fede180cbb972 100644 (file)
--- 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);