Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.emacs
	.emacs.d/custom.el

1 files changed, 9 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index da553de..8c0ffa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,25 @@
 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 '$<' > '$@'
 	for file in $(NANO_SHARE)/*.nanorc; do echo "include \"$$file\""; done >> '$@'
 
 .folders: Maildir
-	find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@'|sort>'$@'
+	( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
 
 .crontab.cookie: .crontab .crontab.local
-	cat $^ | crontab -
+	(cat $^; echo) | crontab -
 	date > '$@'
 
 # don't do anything, just create these if they doesn't exist
@@ -27,6 +27,9 @@ clean:
 	touch '$@'
 Maildir:
 	mkdir -p '$@'/{cur,new,tmp}
+Maildir/%: | Maildir
+	mkdir -p '$@'/{cur,new,tmp}
+	touch '$@'/maildirfolder
 
 commit:
 	git commit -a