mv bash_aliases, more zsh settings

[dotfiles.git] / Makefile

diff --git a/Makefile b/Makefile
index 1e63778452555e8a3008f374d82607a0d1381f93..1f63f7cde52674dbd779d39e5a8542b9fb88fe43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,30 @@
 APATH := $(realpath .)
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
-EXCLUDES := Makefile 
-ALL := $(wildcard *)
-FILES := $(filter-out $(EXCLUDES),$(ALL))
+FILES := bin
+DOTFILES := aliasesrc bash* flexget vim* zsh*
 
-
-test:
-       echo $(APATH)
-       echo $(FILES);
-       echo $(RPATH)
-
-.PHONY: install $(FILES)
-install: $(FILES)
+.PHONY: install $(FILES) $(DOTFILES)
+install: $(FILES) $(DOTFILES)
 
 $(FILES): 
-       cp -r ~/.$@ $@
-       rm -r ~/.$@
-       ln -sf $(RPATH)/$@ ~/.$@ 
+       @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
+           if [[ -d $@ ]]; then \
+             cp -r ~/$@/* $@; \
+           else \
+             cp -r ~/$@ $@; \
+           fi; \
+           rm -r ~/$@; \
+       fi; 
+       ln -sfT $(RPATH)/$@ ~/$@
+
+$(DOTFILES): 
+       @if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
+           if [[ -d .$@ ]]; then \
+             cp -r ~/.$@/* $@; \
+           else \
+             cp -r ~/.$@ $@; \
+           fi; \
+           rm -r ~/.$@; \
+       fi; 
+       ln -sfT $(RPATH)/$@ ~/.$@