diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-16 21:59:01 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-16 21:59:01 -0400 |
| commit | 88abc5c61ee6dd35478045c6abe38db180ddd88c (patch) | |
| tree | 7ab27e68e8f4dbf38a0bd207dfa9f2e0053a543e | |
| parent | dcd02f4498b97a4a5d4dfce975142d8f98bfd892 (diff) | |
| parent | 10f53560cac77820fecafcb7c9343fc2c9a67db4 (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
| -rw-r--r-- | .git.info.exclude | 1 | ||||
| -rw-r--r-- | .profile | 2 | ||||
| -rw-r--r-- | Makefile | 19 |
3 files changed, 10 insertions, 12 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index 1c3e168..871ebf6 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -94,6 +94,7 @@ lock .gem .offlineimap .prefix +.prefix.* .terminfo .wine* @@ -9,7 +9,7 @@ umask 022 ## Paths ############################################################# # Unix -bins=`echo $HOME/bin $HOME/.local/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin` +bins=$(echo $HOME/bin $HOME/.local.`arch`/bin $HOME/.local/bin $HOME/.prefix.`arch`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) for dir in $bins; do if [ -d "$dir" ]; then export PATH="$dir:$PATH" @@ -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: ; |