]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge pull request #235 from jirislaby/patch-1
authorHiroshi Shirosaki <h.shirosaki@gmail.com>
Wed, 9 Dec 2015 06:47:02 +0000 (15:47 +0900)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Wed, 9 Dec 2015 06:47:02 +0000 (15:47 +0900)
Makefile: support DESTDIR

1  2 
Makefile

diff --combined Makefile
index 3f71158636620aa6695cd1e3b31a50f7b323c4b1,4b2ed8d66950c173ddeb1e44880716b5712b71b8..9260a5281f14a940f3faaf31b9a61add8bf03aaa
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- VIMDIR=/usr/share/vim
+ VIMDIR=$(DESTDIR)/usr/share/vim
  ADDONS=${VIMDIR}/addons
  REGISTRY=${VIMDIR}/registry
  
@@@ -15,21 -15,3 +15,21 @@@ install
        cp -v after/ftplugin/markdown.vim ${ADDONS}/after/ftplugin/markdown.vim
        mkdir -pv ${REGISTRY}
        cp -v registry/markdown.yaml ${REGISTRY}/markdown.yaml
 +
 +test: build/tabular build/vader.vim
 +      test/run-tests.sh
 +.PHONY: test
 +
 +update: build/tabular build/vader.vim
 +      cd build/tabular && git pull
 +      cd build/vader.vim && git pull
 +.PHONY: update
 +
 +build/tabular: | build
 +      git clone https://github.com/godlygeek/tabular build/tabular
 +
 +build/vader.vim: | build
 +      git clone https://github.com/junegunn/vader.vim build/vader.vim
 +
 +build:
 +      mkdir build