diff options
author | smitsohu <smitsohu@gmail.com> | 2020-07-17 00:53:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-17 00:53:52 +0200 |
commit | b4afda1b760073572392dc2d361ad655b8e041c4 (patch) | |
tree | f948e224ecf276f94a26fad1b18ae344a1b9367a /Makefile.in | |
parent | add element-desktop redirect profile (#3517) (diff) | |
parent | fixing busybox workaround (diff) | |
download | firejail-b4afda1b760073572392dc2d361ad655b8e041c4.tar.gz firejail-b4afda1b760073572392dc2d361ad655b8e041c4.tar.zst firejail-b4afda1b760073572392dc2d361ad655b8e041c4.zip |
Merge pull request #3516 from smitsohu/busybox
fixing busybox workaround
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 6988ae1d6..65dd430b5 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -117,12 +117,13 @@ endif | |||
117 | # documents | 117 | # documents |
118 | install -m 0755 -d $(DESTDIR)$(DOCDIR) | 118 | install -m 0755 -d $(DESTDIR)$(DOCDIR) |
119 | install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* | 119 | install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* |
120 | ifeq ($(BUSYBOX_WORKAROUND),yes) | 120 | # profiles and settings |
121 | ./mketc.sh | ||
122 | endif | ||
123 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail | 121 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail |
124 | 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 | 122 | 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 |
125 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 123 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
124 | ifeq ($(BUSYBOX_WORKAROUND),yes) | ||
125 | ./mketc.sh $(DESTDIR)$(sysconfdir)/firejail/disable-common.inc | ||
126 | endif | ||
126 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 127 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
127 | # install apparmor profile | 128 | # install apparmor profile |
128 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" | 129 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" |