ignore links in MAkefile

[dotfiles.git] / Makefile

diff --git a/Makefile b/Makefile
index 48a4ccb4b2c6fbc446de750f1f4e61e07faca6f6..1c5af2e8ce39292d22c4af7f15fae91b5ff8bc46 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,30 @@
 APATH := $(realpath .)
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
-FILES :=
+FILES := bin
 DOTFILES := bash* flexget vim*
 
 .PHONY: install $(FILES) $(DOTFILES)
 install: $(FILES) $(DOTFILES)
 
 $(FILES): 
-       @if [[ -f ~/$@ || -d ~/$@ ]]; then \
-         if [[ -d $@ ]]; then \
-           cp -r ~/$@/* $@; \
-         else \
-           cp -r ~/$@ $@; \
-         fi; \
-         rm -r ~/$@; \
+       @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
+           if [[ -d $@ ]]; then \
+             cp -r ~/$@/* $@; \
+           else \
+             cp -r ~/$@ $@; \
+           fi; \
+           rm -r ~/$@; \
        fi; 
-       ln -sf $(RPATH)/$@ ~/.$@ 
+       ln -sf $(RPATH)/$@ ~/$@
 
 $(DOTFILES): 
-       @if [[ -f ~/.$@ || -d ~/.$@ ]]; then \
-         if [[ -d $@ ]]; then \
-           cp -r ~/.$@/* $@; \
-         else \
-           cp -r ~/.$@ $@; \
-         fi; \
-         rm -r ~/.$@; \
+       @if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
+           if [[ -d .$@ ]]; then \
+             cp -r ~/.$@/* $@; \
+           else \
+             cp -r ~/.$@ $@; \
+           fi; \
+           rm -r ~/.$@; \
        fi; 
-       ln -sf $(RPATH)/$@ ~/.$@ 
+       ln -sf $(RPATH)/$@ ~/.$@