diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-16 21:59:20 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-16 21:59:20 -0400 |
commit | b6ff14c27c6a64bc16314d251f83570813c41af3 (patch) | |
tree | c990cfd68d1687dce9e53f3b448d773688c12ae6 /Makefile | |
parent | a8af47ce4e5c9fad0e4c0becbca394f699e9d6a7 (diff) | |
parent | 88abc5c61ee6dd35478045c6abe38db180ddd88c (diff) |
Merge branch 'master' into thinkpenguin-par
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -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: ; |