Merge pull request #397 from jmlich/fix-path

chirp.raw should be in /usr/share/harbour-amazfishd
piggz · Sep 27, 2024 · faee8ea · faee8ea
2 parents 40ee174 + abbaeda
commit faee8ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
@@ -82,7 +82,7 @@ systemd_services.path = $$PREFIX/lib/systemd/user/
 systemd_services.files = $$OUT_PWD/harbour-amazfish.service
 systemd_services.CONFIG += no_check_exist
 
-chirp.path = $$PREFIX/share/harbour-amazfish/
+chirp.path = $$PREFIX/share/harbour-amazfishd/
 chirp.files = chirp.raw
 
 #Install appropriate files for each system

diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -691,9 +691,9 @@ void DeviceInterface::findDevice()
 
 
 #ifdef MER_EDITION_SAILFISH
-    QFile file("/usr/share/harbour-amazfish/chirp.raw");
+    QFile file("/usr/share/harbour-amazfishd/chirp.raw");
 #else // elif defined(UUITK_EDITION)
-    QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfish/chirp.raw");
+    QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfishd/chirp.raw");
 #endif
 
     if(!file.open(QIODevice::ReadOnly))

diff --git a/rpm/harbour-amazfish.spec b/rpm/harbour-amazfish.spec
@@ -122,6 +122,6 @@ desktop-file-install --delete-original       \
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-ui.svg
 %{_userunitdir}/harbour-amazfish.service
 %{_datadir}/mapplauncherd/privileges.d/harbour-amazfishd.privileges
-%{_datadir}/harbour-amazfish/chirp.raw
+%{_datadir}/harbour-amazfishd/chirp.raw
 # >> files
 # << files