diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
commit | 1ff883371700757696efafefe266572776ac9558 (patch) | |
tree | d2104f7f405f4fe7a8957e86f53300ee6d4b1aeb /Makefile | |
parent | 3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (diff) | |
parent | 3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 (diff) |
Merge branch 'master' into build64-par
Conflicts:
.login-daemons
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 26 |
1 files changed, 10 insertions, 16 deletions
@@ -1,25 +1,25 @@ -CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/ -NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK))))) +SHELL = /bin/bash -ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo) +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))))) -targets=.nanorc .folders .crontab.cookie .current.asound +targets=.nanorc .folders .crontab.cookie .git.info.exclude all: $(targets) clean: rm -f $(targets) -%.asound: FORCE - $(ALSACTL) store --file '$@' - .nanorc: .nanorc.in $(NANO_SHARE) cat '$<' > '$@' for file in $(NANO_SHARE)/*.nanorc; do echo "include \"$$file\""; done >> '$@' .folders: Maildir ( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@' +.git.info.exclude: .git.info.exclude.in . + ( cat $<; find . -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ .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 +31,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: ; |