diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
commit | 786fcda41a731654dd2de7496d5f28bc7bb19743 (patch) | |
tree | ab557aa22a6463fd15667ec738b12f7fd78d7aa1 /Makefile | |
parent | 614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.kde/share/apps
.kde/share/config
.kde4
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -9,22 +9,20 @@ all: $(targets) clean: rm -f $(targets) -.nanorc: .nanorc.in $(NANO_SHARE) +.config/nanorc: .config/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@^\./@/@' ) > $@ +.git.info.exclude: .git.info.exclude.in $(shell echo .??*/) + ( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ -.crontab.cookie: .crontab .crontab.local - -(cat $^; echo) | crontab - 2>/dev/null +.cache/cron/cookie: .config/cron + -(cat $^/*; echo) | crontab - 2>/dev/null + mkdir -p '$(@D)' date > '$@' -# don't do anything, just create these if they doesn't exist -.crontab.local: - touch '$@' Maildir: mkdir -p '$@'/{cur,new,tmp} Maildir/%: | Maildir |