From e30c57eebf8da9eb8bb7c77a6bcaaae07acc8f23 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Tue, 21 May 2024 10:07:34 -0300
Subject: build: use -t in applicable install commands

For increased consistency and readability.
---
 Makefile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d95520233..8a65f50ef 100644
--- a/Makefile
+++ b/Makefile
@@ -204,16 +204,16 @@ distclean: clean
 install: all config.mk
 	# firejail executable
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 0755 src/firejail/firejail $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firejail/firejail
 ifeq ($(HAVE_SUID),-DHAVE_SUID)
 	chmod u+s $(DESTDIR)$(bindir)/firejail
 endif
 	# firemon executable
-	$(INSTALL) -m 0755 src/firemon/firemon $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firemon/firemon
 	# firecfg executable
-	$(INSTALL) -m 0755 src/firecfg/firecfg $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firecfg/firecfg
 	# jailcheck executable
-	$(INSTALL) -m 0755 src/jailcheck/jailcheck $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/jailcheck/jailcheck
 	# libraries and plugins
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)/firejail
 	$(INSTALL) -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh
@@ -231,11 +231,11 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes)
 	# vim syntax
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
-	$(INSTALL) -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
-	$(INSTALL) -m 0644 contrib/syntax/files/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect contrib/vim/ftdetect/firejail.vim
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax contrib/syntax/files/firejail.vim
 	# gtksourceview language-specs
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs
-	$(INSTALL) -m 0644 contrib/syntax/files/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs contrib/syntax/files/firejail-profile.lang
 endif
 	# documents
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)
@@ -246,7 +246,7 @@ endif
 	$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config
 	$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config
 	sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/firejail/login.users ]; then \
-		$(INSTALL) -m 0644 etc/login.users $(DESTDIR)$(sysconfdir)/firejail/.; \
+		$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/login.users; \
 	fi"
 ifeq ($(HAVE_IDS),-DHAVE_IDS)
 	$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/ids.config
@@ -257,7 +257,7 @@ endif
 ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
 	# install apparmor profile
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d
-	$(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/apparmor.d etc/apparmor/firejail-default
 	# install apparmor profile customization file
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local
 	sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default ]; then \
@@ -265,13 +265,13 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
 	fi"
 	# install apparmor base abstraction drop-in
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d
-	$(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d etc/apparmor/firejail-base
 endif
 ifneq ($(HAVE_MAN),no)
 	# man pages
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
-	$(INSTALL) -m 0644 $(MANPAGES1_GZ) $(DESTDIR)$(mandir)/man1/
-	$(INSTALL) -m 0644 $(MANPAGES5_GZ) $(DESTDIR)$(mandir)/man5/
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man1 $(MANPAGES1_GZ)
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man5 $(MANPAGES5_GZ)
 endif
 	# bash completion
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions
@@ -280,7 +280,7 @@ endif
 	$(INSTALL) -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg
 	# zsh completion
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/zsh/site-functions
-	$(INSTALL) -m 0644 src/zsh_completion/_firejail $(DESTDIR)$(datarootdir)/zsh/site-functions/
+	$(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/zsh/site-functions src/zsh_completion/_firejail
 
 .PHONY: install-strip
 install-strip: strip install
-- 
cgit v1.2.3-70-g09d2