Merge branch 'master' of tardis:/dotfiles

[dotfiles.git] / Makefile

diff --git a/Makefile b/Makefile
index 1f63f7cde52674dbd779d39e5a8542b9fb88fe43..9c266c3f77c17e1aa568051898dd7b8f131911d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 APATH := $(realpath .)
-RPATH := $(subst $(wildcard ~/),,$(APATH))
 
 FILES := bin
-DOTFILES := aliasesrc bash* flexget vim* zsh*
+DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp profile weechat Xresources xprofile zprofile zshenv zshrc
+CONFIGFILES := aliases compton.conf git mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh
 
-.PHONY: install $(FILES) $(DOTFILES)
-install: $(FILES) $(DOTFILES)
+.PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
+install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 
 $(FILES): 
        @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
@@ -16,7 +16,7 @@ $(FILES):
            fi; \
            rm -r ~/$@; \
        fi; 
-       ln -sfT $(RPATH)/$@ ~/$@
+       ln -sfT $(APATH)/$@ ~/$@
 
 $(DOTFILES): 
        @if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
@@ -27,4 +27,15 @@ $(DOTFILES):
            fi; \
            rm -r ~/.$@; \
        fi; 
-       ln -sfT $(RPATH)/$@ ~/.$@
+       ln -sfT $(APATH)/$@ ~/.$@
+
+$(CONFIGFILES): 
+       @if [[ -e ~/.config/$@ && ! -L ~/.config/$@ ]]; then \
+           if [[ -d .config/$@ ]]; then \
+             cp -r ~/.config/$@/* $@; \
+           else \
+             cp -r ~/.config/$@ $@; \
+           fi; \
+           rm -r ~/.config/$@; \
+       fi; 
+       ln -sfT $(APATH)/$@ ~/.config/$@