aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-05-21 10:07:34 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-06-02 12:08:41 -0300
commite30c57eebf8da9eb8bb7c77a6bcaaae07acc8f23 (patch)
tree220b0809caf46ad9370fdae5deab355cc9192da9
parentbuild: stop checking for dir existence on install (diff)
downloadfirejail-e30c57eebf8da9eb8bb7c77a6bcaaae07acc8f23.tar.gz
firejail-e30c57eebf8da9eb8bb7c77a6bcaaae07acc8f23.tar.zst
firejail-e30c57eebf8da9eb8bb7c77a6bcaaae07acc8f23.zip
build: use -t in applicable install commands
For increased consistency and readability.
-rw-r--r--Makefile26
1 files changed, 13 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index d95520233..8a65f50ef 100644
--- a/Makefile
+++ b/Makefile
@@ -204,16 +204,16 @@ distclean: clean
204install: all config.mk 204install: all config.mk
205 # firejail executable 205 # firejail executable
206 $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) 206 $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir)
207 $(INSTALL) -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) 207 $(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firejail/firejail
208ifeq ($(HAVE_SUID),-DHAVE_SUID) 208ifeq ($(HAVE_SUID),-DHAVE_SUID)
209 chmod u+s $(DESTDIR)$(bindir)/firejail 209 chmod u+s $(DESTDIR)$(bindir)/firejail
210endif 210endif
211 # firemon executable 211 # firemon executable
212 $(INSTALL) -m 0755 src/firemon/firemon $(DESTDIR)$(bindir) 212 $(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firemon/firemon
213 # firecfg executable 213 # firecfg executable
214 $(INSTALL) -m 0755 src/firecfg/firecfg $(DESTDIR)$(bindir) 214 $(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/firecfg/firecfg
215 # jailcheck executable 215 # jailcheck executable
216 $(INSTALL) -m 0755 src/jailcheck/jailcheck $(DESTDIR)$(bindir) 216 $(INSTALL) -m 0755 -t $(DESTDIR)$(bindir) src/jailcheck/jailcheck
217 # libraries and plugins 217 # libraries and plugins
218 $(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)/firejail 218 $(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)/firejail
219 $(INSTALL) -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh 219 $(INSTALL) -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh
@@ -231,11 +231,11 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes)
231 # vim syntax 231 # vim syntax
232 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect 232 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
233 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax 233 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
234 $(INSTALL) -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect 234 $(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect contrib/vim/ftdetect/firejail.vim
235 $(INSTALL) -m 0644 contrib/syntax/files/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax 235 $(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax contrib/syntax/files/firejail.vim
236 # gtksourceview language-specs 236 # gtksourceview language-specs
237 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs 237 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs
238 $(INSTALL) -m 0644 contrib/syntax/files/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs 238 $(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs contrib/syntax/files/firejail-profile.lang
239endif 239endif
240 # documents 240 # documents
241 $(INSTALL) -m 0755 -d $(DESTDIR)$(docdir) 241 $(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)
@@ -246,7 +246,7 @@ endif
246 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config 246 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config
247 $(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 247 $(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
248 sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/firejail/login.users ]; then \ 248 sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/firejail/login.users ]; then \
249 $(INSTALL) -m 0644 etc/login.users $(DESTDIR)$(sysconfdir)/firejail/.; \ 249 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/login.users; \
250 fi" 250 fi"
251ifeq ($(HAVE_IDS),-DHAVE_IDS) 251ifeq ($(HAVE_IDS),-DHAVE_IDS)
252 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/ids.config 252 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/ids.config
@@ -257,7 +257,7 @@ endif
257ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) 257ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
258 # install apparmor profile 258 # install apparmor profile
259 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d 259 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d
260 $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d 260 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/apparmor.d etc/apparmor/firejail-default
261 # install apparmor profile customization file 261 # install apparmor profile customization file
262 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local 262 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local
263 sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default ]; then \ 263 sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default ]; then \
@@ -265,13 +265,13 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
265 fi" 265 fi"
266 # install apparmor base abstraction drop-in 266 # install apparmor base abstraction drop-in
267 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d 267 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d
268 $(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d 268 $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d etc/apparmor/firejail-base
269endif 269endif
270ifneq ($(HAVE_MAN),no) 270ifneq ($(HAVE_MAN),no)
271 # man pages 271 # man pages
272 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 272 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
273 $(INSTALL) -m 0644 $(MANPAGES1_GZ) $(DESTDIR)$(mandir)/man1/ 273 $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man1 $(MANPAGES1_GZ)
274 $(INSTALL) -m 0644 $(MANPAGES5_GZ) $(DESTDIR)$(mandir)/man5/ 274 $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man5 $(MANPAGES5_GZ)
275endif 275endif
276 # bash completion 276 # bash completion
277 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions 277 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions
@@ -280,7 +280,7 @@ endif
280 $(INSTALL) -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg 280 $(INSTALL) -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg
281 # zsh completion 281 # zsh completion
282 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/zsh/site-functions 282 $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/zsh/site-functions
283 $(INSTALL) -m 0644 src/zsh_completion/_firejail $(DESTDIR)$(datarootdir)/zsh/site-functions/ 283 $(INSTALL) -m 0644 -t $(DESTDIR)$(datarootdir)/zsh/site-functions src/zsh_completion/_firejail
284 284
285.PHONY: install-strip 285.PHONY: install-strip
286install-strip: strip install 286install-strip: strip install