From a119d939371c5155dc958f279977b84a7463f8cc Mon Sep 17 00:00:00 2001 From: Moacir Rosa Date: Mon, 12 Mar 2012 05:03:02 -0300 Subject: [PATCH] Fix makefile and submodules --- .gitmodules | 3 --- Makefile | 24 ++++++++++++++++-------- README.markdown | 6 ++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index b14e021..85b0885 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "src/bundle/vim-markdown"] path = src/vim/bundle/vim-markdown url = git://github.com/hallison/vim-markdown.git -[submodule "src/bundle/Command-T"] - path = src/vim/bundle/Command-T - url = git://git.wincent.com/command-t.git [submodule "src/vim/bundle/Command-T"] path = src/vim/bundle/Command-T url = git://git.wincent.com/command-t.git diff --git a/Makefile b/Makefile index 63fb02e..8819db6 100644 --- a/Makefile +++ b/Makefile @@ -3,30 +3,38 @@ # http://ubuntuforums.org/showthread.php?t=275202 # # + +START="$(shell pwd)" + help: @echo "install - install + compile native things." @echo "update - Download update for all plugins." -install: symlink submodules commandt fonts +install: symlink submodules fonts bye symlink: - ln -sf ~+/src/vimrc ~/.vimrc - ln -sf ~+/src/gvimrc ~/.gvimrc - ln -sf ~+/src/vim ~/.vim + ln -sf "$(shell readlink -f "src/vimrc")" ~/.vimrc + ln -sf "$(shell readlink -f "src/gvimrc")" ~/.gvimrc + ln -sf "$(shell readlink -f "src/vim")" ~/.vim submodules: git submodule init git submodule update commandt: - cd src/vim/bundle/Command-T/ruby/command-t/;\ - /usr/bin/ruby extconf.rb;\ - make clean && make + cd src/vim/bundle/Command-T + ruby extconf.rb + make fonts: + current="$(shell pwd)" mkdir -p /usr/share/fonts/truetype/font-install - cp ~+/bin/Monaco.ttf /usr/share/fonts/truetype/font-install/Monaco.ttf + cp bin/Monaco.ttf /usr/share/fonts/truetype/font-install/Monaco.ttf fc-cache -fv + cd "$(START)" update: git submodule foreach git pull origin master + +bye: + @echo "Congratulations! You did!" diff --git a/README.markdown b/README.markdown index e69de29..33fd042 100644 --- a/README.markdown +++ b/README.markdown @@ -0,0 +1,6 @@ +Requirements +------------ + +* Vim-Nox +* Exuberant CTags +