diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 71578eb..257742f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2189,7 +2189,7 @@ test check: unittests $(TERM_TEST) scripttests scripttests: $(MAKE) -f Makefile $(VIMTARGET) if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ - cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ + cd $(PODIR); $(MAKE) -f Makefile check VIMPROG=../$(VIMTARGET); \ fi -if test $(VIMTARGET) != vim -a ! -r vim; then \ ln -s $(VIMTARGET) vim; \ @@ -2354,10 +2354,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \ cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \ mv -f tags tags.dist; fi @echo generating help tags - # We can assume Vim was build, but it may not have been installed, - # thus use the executable in the current directory. - -@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ - $(MAKE) VIMEXE="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi + -@BUILD_DIR=`pwd`; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ + $(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ @@ -2626,7 +2624,7 @@ ICONTHEMEPATH = $(DATADIR)/icons/hicolor DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: - if test -n "$(DESTDIR)"; then \ + if test -n "$(DESTDIR)$(DATADIR)"; then \ $(MKDIR_P) $(ICON48PATH) $(ICON32PATH) \ $(ICON16PATH) $(DESKTOPPATH); \ fi @@ -2847,6 +2845,8 @@ uninstall_runtime: -rm -f $(SYS_OPTWIN_FILE) -rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt -rm -rf $(DEST_COL)/tools + -rm -f $(DESKTOPPATH)/vim.desktop $(DESKTOPPATH)/gvim.desktop + -rm -f $(ICON16PATH)/gvim.png $(ICON32PATH)/gvim.png $(ICON48PATH)/gvim.png -rm -rf $(DEST_COL)/lists -rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt -rm -f $(DEST_SYN)/modula2/opt/*.vim |