diff options
| author |  rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-04-12 14:59:32 +0200 |
|---|---|---|
| committer | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-04-13 17:35:05 +0200 |
| commit | 58f44a4b28a57906187ec44c725ffaa044a04329 (patch) | |
| tree | 7357c5c14c4898c4630be03af7584a848a49b798 /Makefile.in | |
| parent | suport mkdir and mkfile for /run/user/<PID> directory (#3346) (diff) | |
| download | firejail-58f44a4b28a57906187ec44c725ffaa044a04329.tar.gz firejail-58f44a4b28a57906187ec44c725ffaa044a04329.tar.zst firejail-58f44a4b28a57906187ec44c725ffaa044a04329.zip | |
misc fixes
- Makefile.in: loops are slow
- Makefile.in: firecfg.config wasn't installed
- allow-gjs.inc: gjs uses libmozjs, forgotten to commit
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 0a0715023..13d5c456a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -94,12 +94,8 @@ endif | |||
| 94 | install -c -m 0755 src/firecfg/firecfg $(DESTDIR)/$(bindir)/. | 94 | install -c -m 0755 src/firecfg/firecfg $(DESTDIR)/$(bindir)/. |
| 95 | # libraries and plugins | 95 | # libraries and plugins |
| 96 | install -m 0755 -d $(DESTDIR)/$(libdir)/firejail | 96 | install -m 0755 -d $(DESTDIR)/$(libdir)/firejail |
| 97 | for file in $(MYLIBS) $(SECCOMP_FILTERS); do \ | 97 | install -m 0644 -t $(DESTDIR)/$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) src/firecfg/firecfg.config |
| 98 | install -c -m 0644 $$file $(DESTDIR)/$(libdir)/firejail/; \ | 98 | install -m 0755 -t $(DESTDIR)/$(libdir)/firejail $(SBOX_APPS) |
| 99 | done | ||
| 100 | for app in $(SBOX_APPS); do \ | ||
| 101 | install -c -m 0755 $$app $(DESTDIR)/$(libdir)/firejail/; \ | ||
| 102 | done | ||
| 103 | ifeq ($(HAVE_CONTRIB_INSTALL),yes) | 99 | ifeq ($(HAVE_CONTRIB_INSTALL),yes) |
| 104 | install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/. | 100 | install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/. |
| 105 | install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/. | 101 | install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/. |
| @@ -121,9 +117,6 @@ ifeq ($(BUSYBOX_WORKAROUND),yes) | |||
| 121 | endif | 117 | endif |
| 122 | install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail | 118 | install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail |
| 123 | install -m 0644 -t $(DESTDIR)/$(sysconfdir)/firejail etc/*.profile etc/*.inc etc/*.net etc/firejail.config | 119 | install -m 0644 -t $(DESTDIR)/$(sysconfdir)/firejail etc/*.profile etc/*.inc etc/*.net etc/firejail.config |
| 124 | # for file in etc/*.profile etc/*.inc etc/*.net etc/firejail.config; do \ | ||
| 125 | # install -c -m 0644 $$file $(DESTDIR)/$(sysconfdir)/firejail; \ | ||
| 126 | # done | ||
| 127 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 120 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
| 128 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 121 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
| 129 | # install apparmor profile | 122 | # install apparmor profile |