finally working makefile

diff --git a/Makefile b/Makefile
index a5116c4e341252ea80c2eb8bd7782c69472a5bfa..51eeb965237744da3386393532590225108e3a0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,30 @@
 APATH := $(realpath .)
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
-EXCLUDES := Makefile 
-ALL := $(wildcard *)
-FILES := $(filter-out $(EXCLUDES),$(ALL))
+FILES :=
+DOTFILES := bash* flexget vimrc
 
-.PHONY: install $(FILES)
-install: $(FILES)
+.PHONY: install $(FILES) $(DOTFILES)
+install: $(FILES) $(DOTFILES)
 
 $(FILES): 
-       cp -r ~/.$@ $@
-       rm -r ~/.$@
+       if [[ -f ~/$@ || -d ~/$@ ]]; then \
+         if [[ -d $@ ]]; then \
+           cp -rf ~/$@/* $@; \
+         else \
+           cp -rf ~/$@ $@; \
+         fi; \
+         rm -r ~/$@; \
+       fi; 
+       ln -sf $(RPATH)/$@ ~/.$@ 
+
+$(DOTFILES): 
+       if [[ -f ~/.$@ || -d ~/.$@ ]]; then \
+         if [[ -d $@ ]]; then \
+           cp -rf ~/.$@/* $@; \
+         else \
+           cp -rf ~/.$@ $@; \
+         fi; \
+         rm -r ~/.$@; \
+       fi; 
        ln -sf $(RPATH)/$@ ~/.$@ 

diff --git a/flexget/.gitignore b/flexget/.gitignore
new file mode 100644 (file)
index 0000000..9625a75
--- /dev/null
+++ b/flexget/.gitignore
@@ -0,0 +1,4 @@
+db-config.sqlite
+flexget.log*
+received/
+temp/