diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-05-21 09:22:11 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-06-02 12:08:41 -0300 |
commit | afdb371f2743e4f9b363acbe6c7f2472595044b7 (patch) | |
tree | de37ea8120ed6bbca086f27d62393c6f84895344 /Makefile | |
parent | build: remove redundant parent dir install (diff) | |
download | firejail-afdb371f2743e4f9b363acbe6c7f2472595044b7.tar.gz firejail-afdb371f2743e4f9b363acbe6c7f2472595044b7.tar.zst firejail-afdb371f2743e4f9b363acbe6c7f2472595044b7.zip |
build: fix some inconsistencies in install commands
Changes:
* Remove / after `$(DESTDIR)`
* Remove useless -c
* Use 0755 instead of 755
* Use -d after -m
See also commit dae3933bc ("rework make realinstall and uninstall
(#3435)", 2020-06-04).
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -245,8 +245,8 @@ endif | |||
245 | $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail/firecfg.d | 245 | $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail/firecfg.d |
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) -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; \ | 249 | $(INSTALL) -m 0644 etc/login.users $(DESTDIR)$(sysconfdir)/firejail/.; \ |
250 | fi" | 250 | fi" |
251 | ifeq ($(HAVE_IDS),-DHAVE_IDS) | 251 | ifeq ($(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 |
@@ -256,21 +256,20 @@ ifeq ($(BUSYBOX_WORKAROUND),yes) | |||
256 | endif | 256 | endif |
257 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 257 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
258 | # install apparmor profile | 258 | # install apparmor profile |
259 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then \ | 259 | sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ]; then \ |
260 | $(INSTALL) -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; \ | 260 | $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d; \ |
261 | fi" | 261 | fi" |
262 | $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d | 262 | $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d |
263 | # install apparmor profile customization file | 263 | # install apparmor profile customization file |
264 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then \ | 264 | sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ]; then \ |
265 | $(INSTALL) -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; \ | 265 | $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local; \ |
266 | fi" | 266 | fi" |
267 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then \ | 267 | sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default ]; then \ |
268 | $(INSTALL) -c -m 0644 etc/apparmor/firejail-local \ | 268 | $(INSTALL) -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default; \ |
269 | $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; \ | ||
270 | fi" | 269 | fi" |
271 | # install apparmor base abstraction drop-in | 270 | # install apparmor base abstraction drop-in |
272 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/abstractions/base.d ]; then \ | 271 | sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d ]; then \ |
273 | $(INSTALL) -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/abstractions/base.d; \ | 272 | $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d; \ |
274 | fi" | 273 | fi" |
275 | $(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d | 274 | $(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d |
276 | endif | 275 | endif |