X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=Makefile;h=76f1bd14baa4d8bb79b75e141272e7229246d3d9;hp=d3f0af683f8728890a31a8bcbc1761cbe4203ce4;hb=cdf648b13dacc11edd25af11c93a67dbe7097743;hpb=73dab8a79031aed177f3dbff361404e0a5c285ea diff --git a/Makefile b/Makefile index d3f0af68..76f1bd14 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,9 @@ SHELL = /bin/bash .PHONY: all -all: git_hooks +all: git_hooks vim_helpers $(info make git_hooks: set up Git repository hooks) - -puppet_parseonly = puppet parser validate + $(info make vim_hooks: set up Vim settings for puppet files) .PHONY: git_hooks git_hooks: @@ -17,8 +16,9 @@ git_hooks: @if git config --get branch.master.rebase true >/dev/null; then \ git config branch.master.rebase true; \ fi - @ln -sf ../../tools/git_hooks/pre-commit .git/hooks/pre-commit + @ln -sf ../../tools/git-hooks/pre-commit .git/hooks/pre-commit @$(RM) .git/hooks/post-commit +.PHONY: vim_helpers vim_helpers: - rsync -a tools/vim ~/.vim/ + @rsync -a tools/vim/ ~/.vim/