From e9f7fef7880b7f37c9da0b2be5e1ab5b08b23f6c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 22 Aug 2012 11:55:27 -0400 Subject: add .prefix.`arch` and .local.`arch` directories --- .git.info.exclude | 1 + .profile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.git.info.exclude b/.git.info.exclude index 4576b6f..9b65125 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -94,6 +94,7 @@ history.* .gem .offlineimap .prefix +.prefix.* .terminfo .wine* diff --git a/.profile b/.profile index d05ae5e..d6a07e3 100644 --- a/.profile +++ b/.profile @@ -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" -- cgit v1.2.3 From 74e11a21ec9e941c16dcfafb1e7aa5ef5dd4abb9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 4 Sep 2012 10:50:01 -0400 Subject: make Makefile a little more flexible --- Makefile | 19 ++++++++----------- 1 file 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: ; -- cgit v1.2.3