summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
commitd26fda540c355fa37a1381b11765c47fdc5bd006 (patch)
treef6510335adf691d662cae765cb7f77dcdcbf4efc /Makefile
parent3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff)
parent7036a9b36396ae49cf8ba0f8ad5fe139a65433c1 (diff)
Merge branch 'hp-dv6426us-par'
Conflicts: .crontab.local .git.info.exclude .wmii/wmiirc_local
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index def57c3..8c0ffa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/
NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK)))))
-ALSACTL=$(firstword $(shell which alsactl) echo)
+ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo)
-targets=.nanorc .folders .crontab.cookie .alsa.save
+targets=.nanorc .folders .crontab.cookie .current.asound
all: $(targets)
clean:
rm -f $(targets)
-.alsa.save: FORCE
- $(ALSACTL) --file $(HOME)/.alsa.save store || touch '$@'
+%.asound: FORCE
+ $(ALSACTL) store --file '$@'
.nanorc: .nanorc.in $(NANO_SHARE)
cat '$<' > '$@'