From 5430535a27bfd02381817907b19e187bee2695fe Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 21 May 2024 09:43:12 -0300 Subject: build: stop checking for dir existence on install Just try to install them, as is done in the other `$(INSTALL) -d` commands. --- Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index bd8163a37..d95520233 100644 --- a/Makefile +++ b/Makefile @@ -256,21 +256,15 @@ ifeq ($(BUSYBOX_WORKAROUND),yes) endif ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) # install apparmor profile - sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ]; then \ - $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d; \ - fi" + $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d # install apparmor profile customization file - sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ]; then \ - $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local; \ - fi" + $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local sh -c "if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default ]; then \ $(INSTALL) -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default; \ fi" # install apparmor base abstraction drop-in - sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d ]; then \ - $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d; \ - fi" + $(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 endif ifneq ($(HAVE_MAN),no) -- cgit v1.2.3-54-g00ecf