From 2277f52b5990eac0eee854b554ad60768257ce7e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 22 Sep 2012 21:31:10 +0200 Subject: Properly quote Makefile --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ae91fe2..6af7fff 100644 --- a/Makefile +++ b/Makefile @@ -13,17 +13,18 @@ all: @echo "Password store is a shell script, so there is nothing to do. Try \"make install\" instead." install: - @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(SYSCONFDIR)/bash_completion.d - @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)$(SYSCONFDIR)/bash_completion.d/password-store + @mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d" + @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)$(SYSCONFDIR)/bash_completion.d/password-store" # Uncomment to install the zsh completion file too. -# @install -m 0644 -v contrib/pass.zsh-completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass +# @install -m 0644 -v contrib/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass" @$(MAKE) -s install-platform ifneq ($(strip $(wildcard $(PLATFORMFILE))),) install-platform: - @install -m 0644 -v $(PLATFORMFILE) $(DESTDIR)$(LIBDIR)/password-store.platform.sh + @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: -- cgit v1.2.3