summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-09-16 21:59:01 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-09-16 21:59:01 -0400
commit88abc5c61ee6dd35478045c6abe38db180ddd88c (patch)
tree7ab27e68e8f4dbf38a0bd207dfa9f2e0053a543e /Makefile
parentdcd02f4498b97a4a5d4dfce975142d8f98bfd892 (diff)
parent10f53560cac77820fecafcb7c9343fc2c9a67db4 (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 8 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 8c0ffa9..3cecf33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
-CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/
-NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK)))))
+SHELL = /bin/bash
+
+NANO_BIN_PREFIX = $(patsubst %/bin/nano,%,$(shell which nano))
+NANO_CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:$(NANO_BIN_PREFIX)
+NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(NANO_CHECK)))))
ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo)
@@ -19,7 +22,7 @@ clean:
( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
.crontab.cookie: .crontab .crontab.local
- (cat $^; echo) | crontab -
+ -(cat $^; echo) | crontab - 2>/dev/null
date > '$@'
# don't do anything, just create these if they doesn't exist
@@ -31,12 +34,6 @@ Maildir/%: | Maildir
mkdir -p '$@'/{cur,new,tmp}
touch '$@'/maildirfolder
-commit:
- git commit -a
-
-pull:
- git pull
- $(MAKE)
-
-.PHONY: FORCE
+.PHONY: FORCE PHONY
FORCE: ;
+PHONY: ;