diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
commit | b68ce750ac90da4fb88669d256666dbaa39f4338 (patch) | |
tree | cabf50b7a85d1062ba60bd3ebf45fb17965884ca /.config/Makefile | |
parent | 15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff) | |
parent | 34bbf66a460e5c622e209211869b3a8bde8a68d5 (diff) |
Merge remote-tracking branch 'origin/gluglugt60-par' into build64-par
Conflicts:
.config/login.sh
.config/lxpanel/default/config
.config/wmii-hg/config.sh
Diffstat (limited to '.config/Makefile')
-rw-r--r-- | .config/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.config/Makefile b/.config/Makefile index dd4c37f..909486d 100644 --- a/.config/Makefile +++ b/.config/Makefile @@ -2,10 +2,10 @@ SHELL = /bin/bash -GITDIR = ${HOME}/.git +GIT_DIR = ${HOME}/.git targets = \ - ${GITDIR}/info/exclude \ + ${GIT_DIR}/info/exclude \ ${HOME}/.folders \ ${XDG_CACHE_HOME}/config-symlinks/cookie \ ${XDG_CACHE_HOME}/cron/cookie @@ -15,8 +15,8 @@ clean: rm -f $(targets) ${HOME}/.folders: ${HOME}/Maildir $(MAKEFILE_LIST) - find $< -mindepth 2 -maxdepth 2 \( -type f -name "maildirfolder" -o -type d -name new -o -type d -name tmp -o -type d -name cur \) -printf '%P\0' | xargs -0 dirname -z -- | sort -zu | xargs -0 printf '.%s\n' >'$@' -${GITDIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/) + find $< -mindepth 2 -maxdepth 2 \( -type f -name "maildirfolder" -o -type d -name new -o -type d -name tmp -o -type d -name cur \) -printf '%P\0' | xargs -0 dirname -z -- | sort -zu | xargs -0 printf -- '.%s\n' >'$@' +${GIT_DIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/) ( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ ${XDG_CACHE_HOME}/cron/cookie: ${XDG_CONFIG_HOME}/cron @@ -35,6 +35,7 @@ ${HOME}/Maildir/%: | ${HOME}/Maildir mkdir -p '$@'/{cur,new,tmp} touch '$@'/maildirfolder +.DELETE_ON_ERROR: .PHONY: FORCE PHONY FORCE: ; PHONY: ; |