From 9beef511aff07ddeefa53f03f4bccd47f95c3d71 Mon Sep 17 00:00:00 2001
From: Miles Alan <m@milesalan.com>
Date: Sat, 21 Mar 2020 23:45:23 -0500
Subject: [PATCH] Install alsa dmix setup to /etc/alsa/conf.d/ insted of
 /etc/asound.conf Fix sxmo_timer.sh Fix prefix

---
 Makefile                                       | 18 ++++++++++--------
 ...{asound.conf => alsa_sxmo_enable_dmix.conf} |  0
 scripts/sxmo_appmenu.sh                        |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename configs/{asound.conf => alsa_sxmo_enable_dmix.conf} (100%)

diff --git a/Makefile b/Makefile
index 6e710f7..698e328 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX:=/usr
+PREFIX:=/
 
 programs/sxmo_setpineled:
 	gcc -o programs/sxmo_setpineled programs/sxmo_setpineled.c
@@ -7,17 +7,19 @@ programs/sxmo_setpinebacklight:
 	gcc -o programs/sxmo_setpinebacklight programs/sxmo_setpinebacklight.c
 
 install: programs/sxmo_setpineled programs/sxmo_setpinebacklight
-	mkdir -p $(PREFIX)/share/sxmo
-	cp configs/* $(PREFIX)/share/sxmo
-	cp configs/asound.conf /etc/
+	mkdir -p $(PREFIX)/usr/share/sxmo
+	cp configs/* $(PREFIX)/usr/share/sxmo
 
-	mkdir -p $(PREFIX)/bin
-	cp scripts/* $(PREFIX)/bin
+	mkdir -p $(PREFIX)/etc/alsa/conf.d/
+	cp configs/alsa_sxmo_enable_dmix.conf $(PREFIX)/etc/alsa/conf.d/
+
+	mkdir -p $(PREFIX)/usr/bin
+	cp scripts/* $(PREFIX)/usr/bin
 
 	chown root programs/sxmo_setpineled
 	chmod u+s programs/sxmo_setpineled
-	cp programs/sxmo_setpineled $(PREFIX)/bin
+	cp programs/sxmo_setpineled $(PREFIX)/usr/bin
 
 	chown root programs/sxmo_setpinebacklight
 	chmod u+s programs/sxmo_setpinebacklight
-	cp programs/sxmo_setpinebacklight $(PREFIX)/bin
+	cp programs/sxmo_setpinebacklight $(PREFIX)/usr/bin
diff --git a/configs/asound.conf b/configs/alsa_sxmo_enable_dmix.conf
similarity index 100%
rename from configs/asound.conf
rename to configs/alsa_sxmo_enable_dmix.conf
diff --git a/scripts/sxmo_appmenu.sh b/scripts/sxmo_appmenu.sh
index c0aa431..84e19c7 100755
--- a/scripts/sxmo_appmenu.sh
+++ b/scripts/sxmo_appmenu.sh
@@ -26,7 +26,7 @@ programchoicesinit() {
     St              ^ 0 ^ st
     Firefox         ^ 0 ^ firefox
     Foxtrotgps      ^ 0 ^ foxtrotgps
-    Timer           ^ 0 ^ sxmo_timer.sh
+    Timer           ^ 0 ^ sxmo_timermenu.sh
     Close Menu      ^ 0 ^ quit
   ")" && WINNAME=Apps