aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-05-21 09:43:12 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-06-02 12:08:41 -0300
commit5430535a27bfd02381817907b19e187bee2695fe (patch)
tree6461e0a0f3534aed554e39c39d8c57ff809508f8
parentbuild: fix some inconsistencies in install commands (diff)
downloadfirejail-5430535a27bfd02381817907b19e187bee2695fe.tar.gz
firejail-5430535a27bfd02381817907b19e187bee2695fe.tar.zst
firejail-5430535a27bfd02381817907b19e187bee2695fe.zip
build: stop checking for dir existence on install
Just try to install them, as is done in the other `$(INSTALL) -d` commands.
-rw-r--r--Makefile12
1 files 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)
256endif 256endif
257ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) 257ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
258 # install apparmor profile 258 # install apparmor profile
259 sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ]; then \ 259 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d
260 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d; \
261 fi"
262 $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d 260 $(INSTALL) -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d
263 # install apparmor profile customization file 261 # install apparmor profile customization file
264 sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ]; then \ 262 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local
265 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local; \
266 fi"
267 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 \
268 $(INSTALL) -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default; \ 264 $(INSTALL) -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-default; \
269 fi" 265 fi"
270 # install apparmor base abstraction drop-in 266 # install apparmor base abstraction drop-in
271 sh -c "if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d ]; then \ 267 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d
272 $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d; \
273 fi"
274 $(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d 268 $(INSTALL) -m 0644 etc/apparmor/firejail-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d
275endif 269endif
276ifneq ($(HAVE_MAN),no) 270ifneq ($(HAVE_MAN),no)