Merge remote-tracking branch 'origin/master' into purdue-cs

Conflicts:
	.config/X11/clientrc
	.config/bash/rc.d/emacs.sh
	.config/bash/rc.sh
	.config/conkeror
	.config/conkerorrc
	.config/emacs/custom.el
	.config/irbrc
	.config/login.sh
	.config/maildirproc/att.rc
	.config/maildirproc/default.rc
	.config/offlineimaprc
	.config/ssh/config
	.config/wmii-hg/autostart
	.config/wmii-hg/include.sh
	.config/wmii-hg/quit
	.config/wmii-hg/rbar_battery
	.config/wmii-hg/rbar_clock
	.config/wmii-hg/rbar_cpu
	.config/wmii-hg/rbar_wifi
	.conkerorrc
	.maildirproc/default.rc

1 files changed, 40 insertions, 0 deletions

diff --git a/.config/Makefile b/.config/Makefile
new file mode 100644
index 0000000..829b820
--- /dev/null
+++ b/.config/Makefile
@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+SHELL = /bin/bash
+
+GITDIR = ${HOME}/.git
+
+targets = \
+	${GITDIR}/info/exclude \
+	${HOME}/.folders \
+	${XDG_CACHE_HOME}/config-symlinks/cookie \
+	${XDG_CACHE_HOME}/cron/cookie
+
+all: $(targets)
+clean:
+	rm -f $(targets)
+
+${HOME}/.folders: ${HOME}/Maildir
+	( echo '..'; find $< -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
+${GITDIR}/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
+	-(cat $^/*; echo) | crontab - 2>/dev/null
+	mkdir -p '$(@D)'
+	date > '$@'
+
+${XDG_CACHE_HOME}/config-symlinks/cookie: ${XDG_CONFIG_HOME}/symlinks
+	config-symlinks
+	mkdir -p '$(@D)'
+	date > '$@'
+
+${HOME}/Maildir:
+	mkdir -p '$@'/{cur,new,tmp}
+${HOME}/Maildir/%: | ${HOME}/Maildir
+	mkdir -p '$@'/{cur,new,tmp}
+	touch '$@'/maildirfolder
+
+.PHONY: FORCE PHONY
+FORCE: ; 
+PHONY: ;