Makefile install fix

20 files changed, 54 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 379b9a5..c9b027a 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ trayfreq_set_SOURCES	=	trayfreq_set/trayfreq_set.c \
 
 ########################################################################
 # Make entire suite
-all: trayfreq trayfreq-set lang
+all: trayfreq trayfreq-set lang trayfreq.conf
 ########################################################################
 
 
@@ -124,7 +124,7 @@ lang:
 
 ########################################################################
 # Prepare template config file
-config:
+trayfreq.conf:
 	sed	-e 's:SHAREDIR:$(SHAREDIR):g' \
 		-e 's:TRAYFREQ_CONF:$(TRAYFREQ_CONF):g' \
 		trayfreq.conf.src > trayfreq.conf
@@ -141,16 +141,16 @@ clean:
 ########################################################################
 # Install entire suite
 install:
-	install -Dm 755 data/themes $(DESTDIR)/usr/share/trayfreq/
+	install -Dm 755 themes $(DESTDIR)/$(SHAREDIR)/trayfreq/themes
 
-	install -Dm 644 lc/fr.mo $(DESTDIR)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo
+	install -Dm 644 lc/fr.mo $(DESTDIR)/$(LOCALEDIR)/fr/LC_MESSAGES/trayfreq.mo
 
-	install -Dm 644 data/trayfreq.conf $(DESTDIR)/etc/trayfreq.conf
-	install -Dm 644 data/trayfreq.desktop $(DESTDIR)/etc/xdg/autostart/trayfreq.desktop
+	install -Dm 644 trayfreq.conf $(DESTDIR)/etc/trayfreq.conf
+	install -Dm 644 trayfreq.desktop $(DESTDIR)/etc/xdg/autostart/trayfreq.desktop
 
 	install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq
 	install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set
 
-	ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/usr/share/trayfreq/LICENCE
-	ln -s ../../../etc/trayfreq.conf $(DESTDIR)/usr/share/trayfreq/trayfreq.conf
+	ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE
+	ln -s ../../../etc/trayfreq.conf $(DESTDIR)/$(SHAREDIR)/trayfreq/trayfreq.conf
 ########################################################################
diff --git a/themes/default/cpufreq-0.png b/themes/default/cpufreq-0.png
new file mode 100644
index 0000000..9a1b3b4
--- /dev/null
+++ b/themes/default/cpufreq-0.png
diff --git a/themes/default/cpufreq-100.png b/themes/default/cpufreq-100.png
new file mode 100644
index 0000000..6b63453
--- /dev/null
+++ b/themes/default/cpufreq-100.png
diff --git a/themes/default/cpufreq-25.png b/themes/default/cpufreq-25.png
new file mode 100644
index 0000000..ae2acf6
--- /dev/null
+++ b/themes/default/cpufreq-25.png
diff --git a/themes/default/cpufreq-50.png b/themes/default/cpufreq-50.png
new file mode 100644
index 0000000..03ab5e3
--- /dev/null
+++ b/themes/default/cpufreq-50.png
diff --git a/themes/default/cpufreq-75.png b/themes/default/cpufreq-75.png
new file mode 100644
index 0000000..49e9342
--- /dev/null
+++ b/themes/default/cpufreq-75.png
diff --git a/themes/default/traybat-0-charging.png b/themes/default/traybat-0-charging.png
new file mode 100644
index 0000000..9255e66
--- /dev/null
+++ b/themes/default/traybat-0-charging.png
diff --git a/themes/default/traybat-0.png b/themes/default/traybat-0.png
new file mode 100644
index 0000000..2554a6a
--- /dev/null
+++ b/themes/default/traybat-0.png
diff --git a/themes/default/traybat-100-charging.png b/themes/default/traybat-100-charging.png
new file mode 100644
index 0000000..bae3a43
--- /dev/null
+++ b/themes/default/traybat-100-charging.png
diff --git a/themes/default/traybat-100.png b/themes/default/traybat-100.png
new file mode 100644
index 0000000..fe4ba7f
--- /dev/null
+++ b/themes/default/traybat-100.png
diff --git a/themes/default/traybat-20-charging.png b/themes/default/traybat-20-charging.png
new file mode 100644
index 0000000..aabd778
--- /dev/null
+++ b/themes/default/traybat-20-charging.png
diff --git a/themes/default/traybat-20.png b/themes/default/traybat-20.png
new file mode 100644
index 0000000..83e7065
--- /dev/null
+++ b/themes/default/traybat-20.png
diff --git a/themes/default/traybat-40-charging.png b/themes/default/traybat-40-charging.png
new file mode 100644
index 0000000..c016a28
--- /dev/null
+++ b/themes/default/traybat-40-charging.png
diff --git a/themes/default/traybat-40.png b/themes/default/traybat-40.png
new file mode 100644
index 0000000..3245106
--- /dev/null
+++ b/themes/default/traybat-40.png
diff --git a/themes/default/traybat-60-charging.png b/themes/default/traybat-60-charging.png
new file mode 100644
index 0000000..1667458
--- /dev/null
+++ b/themes/default/traybat-60-charging.png
diff --git a/themes/default/traybat-60.png b/themes/default/traybat-60.png
new file mode 100644
index 0000000..aa25803
--- /dev/null
+++ b/themes/default/traybat-60.png
diff --git a/themes/default/traybat-80-charging.png b/themes/default/traybat-80-charging.png
new file mode 100644
index 0000000..b9c6991
--- /dev/null
+++ b/themes/default/traybat-80-charging.png
diff --git a/themes/default/traybat-80.png b/themes/default/traybat-80.png
new file mode 100644
index 0000000..e649be0
--- /dev/null
+++ b/themes/default/traybat-80.png
diff --git a/themes/default/traybat-charged.png b/themes/default/traybat-charged.png
new file mode 100644
index 0000000..1e61940
--- /dev/null
+++ b/themes/default/traybat-charged.png
diff --git a/trayfreq.conf.src b/trayfreq.conf.src
new file mode 100644
index 0000000..753bcb4
--- /dev/null
+++ b/trayfreq.conf.src
@@ -0,0 +1,46 @@
+#
+# Begin TRAYFREQ_CONF
+#
+# Template config file for trayfreq-archlinux
+#
+
+[battery]
+## Uncomment to hide battery icon -- useful for desktop PCs
+## Set to anything (or leave unset/commented out) to show battery icon
+# show=0
+
+## Name of the governor to use for all cores when on battery power
+## Get a space-separated list of available governors from
+## /sys/devices/system/cpu/cpu{{CORE_NUMBER}}/cpufreq/scaling_available_governors
+# governor=powersave
+
+[ac]
+## Governor to use for all core while on AC power
+## Often set to a performance or non-power-saving governor
+# governor=ondemand
+
+[governor]
+## Governor to set all cores to when trayfreq starts
+# default=ondemand
+
+
+[frequency]
+## The frequency to set the CPU to when trayfreq starts
+## Get a space-separated list of available frequencies from
+## /sys/devices/system/cpu/cpu{{CORE_NUMBER}}/cpufreq/scaling_available_frequencies
+# default=800000
+
+
+[extra]
+## Uncomment to make trayfreq run trayfreq-set through sudo.
+## Useful if your WM doesn't run trayfreq as root, but you'll have to give the user
+## trayfreq is run as passwordless sudo access to `trayfreq-set`
+# sudo=1
+
+## If you're arty, you can put together your own theme and point trayfreq to it
+# theme=SHAREDIR/trayfreq/themes/some-theme/
+
+
+#
+# End TRAYFREQ_CONF
+#