Makefile: do not use recursion and organize

12 files changed, 7 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 9f5e6c2..ff9b450 100644
--- a/Makefile
+++ b/Makefile
@@ -6,32 +6,30 @@ MANDIR ?= $(PREFIX)/share/man
 
 PLATFORMFILE := src/platform/$(shell uname | tr '[:upper:]' '[:lower:]').sh
 
-.PHONY: install uninstall install-platform
+.PHONY: install uninstall install-pass
 
 all:
 	@echo "Password store is a shell script, so there is nothing to do. Try \"make install\" instead."
 
-install:
+install-pass:
 	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
 	@install -m 0755 -v src/password-store.sh "$(DESTDIR)$(BINDIR)/pass"
 	@install -m 0644 -v man/pass.1 "$(DESTDIR)$(MANDIR)/man1/pass.1"
-	@install -m 0644 -v contrib/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store"
+	@install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store"
 
 #	Uncomment to install the zsh completion file.
-#	@install -m 0644 -v contrib/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
+#	@install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
 #
 #	Uncomment to install the fish completion file.
-#	@install -m 0644 -v contrib/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
-
-	@$(MAKE) -s install-platform
+#	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
 
 ifneq ($(strip $(wildcard $(PLATFORMFILE))),)
-install-platform:
+install: install-pass
 	@install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
 #	The -i "" doesn't work on GNU, where the extra argument isn't needed. Fortuantely, platform file is for non-GNU only.
 	sed -i "" 's:.*platform-defined-functions.*:source $(DESTDIR)$(LIBDIR)/password-store.platform.sh:' "$(DESTDIR)$(BINDIR)/pass"
 else
-install-platform:
+install: install-pass
 endif
 
 uninstall:
diff --git a/contrib/fpm2pass.pl b/contrib/importers/fpm2pass.pl
index d1a0908..d1a0908 100755
--- a/contrib/fpm2pass.pl
+++ b/contrib/importers/fpm2pass.pl
diff --git a/contrib/gorilla2pass.rb b/contrib/importers/gorilla2pass.rb
index bf168a7..bf168a7 100755
--- a/contrib/gorilla2pass.rb
+++ b/contrib/importers/gorilla2pass.rb
diff --git a/contrib/kedpm2pass.py b/contrib/importers/kedpm2pass.py
index b79cc8b..b79cc8b 100755
--- a/contrib/kedpm2pass.py
+++ b/contrib/importers/kedpm2pass.py
diff --git a/contrib/keepass2pass.py b/contrib/importers/keepass2pass.py
index 80a2ad9..80a2ad9 100755
--- a/contrib/keepass2pass.py
+++ b/contrib/importers/keepass2pass.py
diff --git a/contrib/keepassx2pass.py b/contrib/importers/keepassx2pass.py
index dc4b1e5..dc4b1e5 100755
--- a/contrib/keepassx2pass.py
+++ b/contrib/importers/keepassx2pass.py
diff --git a/contrib/lastpass2pass.rb b/contrib/importers/lastpass2pass.rb
index 41a2a29..41a2a29 100755
--- a/contrib/lastpass2pass.rb
+++ b/contrib/importers/lastpass2pass.rb
diff --git a/contrib/pwsafe2pass.sh b/contrib/importers/pwsafe2pass.sh
index c29bb3f..c29bb3f 100755
--- a/contrib/pwsafe2pass.sh
+++ b/contrib/importers/pwsafe2pass.sh
diff --git a/contrib/revelation2pass.py b/contrib/importers/revelation2pass.py
index f04c1a8..f04c1a8 100755
--- a/contrib/revelation2pass.py
+++ b/contrib/importers/revelation2pass.py
diff --git a/contrib/pass.bash-completion b/src/completion/pass.bash-completion
index d0ef012..d0ef012 100644
--- a/contrib/pass.bash-completion
+++ b/src/completion/pass.bash-completion
diff --git a/contrib/pass.fish-completion b/src/completion/pass.fish-completion
index 9130d1f..9130d1f 100644
--- a/contrib/pass.fish-completion
+++ b/src/completion/pass.fish-completion
diff --git a/contrib/pass.zsh-completion b/src/completion/pass.zsh-completion
index 0bb14de..0bb14de 100644
--- a/contrib/pass.zsh-completion
+++ b/src/completion/pass.zsh-completion