vim: allow setting make_dir and make_targets

diff --git a/vim/vimrc b/vim/vimrc
index 8b35883c1250dfa2c9f56045bd94dac5cc2030bf..8b3ea4fdc2e1e1da0414975b74fd39c75523fb10 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -342,8 +342,21 @@ augroup END
 map <space> <leader>
 
 " make
-nnoremap <leader>r :make!<cr>
-nnoremap <leader><cr> :make!<cr>
+function! Make()
+  let l:make_dir = ""
+  if exists("b:make_dir")
+    let l:make_dir = "-C ".b:make_dir
+  elseif exists("g:make_dir")
+    let l:make_dir = "-C ".g:make_dir
+  endif
+
+  let l:make_targets = ""
+  if exists("g:make_targets")
+    let l:make_targets = g:make_targets
+  endif
+  execute "make! ".l:make_dir." ".l:make_targets
+endf
+nnoremap <leader>r :call Make()<cr>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>