diff options
| author |  rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-06-04 12:56:40 +0200 |
|---|---|---|
| committer | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-06-04 12:56:40 +0200 |
| commit | 52e24dbb3e89beca6d2f748eb3e5e49202270f03 (patch) | |
| tree | 061c9b9222f085dad9d50076043ad1689f4b5ed7 /Makefile.in | |
| parent | rework make realinstall and uninstall (#3435) (diff) | |
| download | firejail-52e24dbb3e89beca6d2f748eb3e5e49202270f03.tar.gz firejail-52e24dbb3e89beca6d2f748eb3e5e49202270f03.tar.zst firejail-52e24dbb3e89beca6d2f748eb3e5e49202270f03.zip | |
fixup! rework make realinstall and uninstall (#3435)
revert long-line split and fix bash-completion
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 56bd3b099..f250f97e2 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -122,22 +122,14 @@ ifeq ($(BUSYBOX_WORKAROUND),yes) | |||
| 122 | endif | 122 | endif |
| 123 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail | 123 | 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 | 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 |
| 125 | if [ ! -f $(DESTDIR)$(sysconfdir)/firejail/login.users ]; then \ | 125 | [ ! -f $(DESTDIR)$(sysconfdir)/firejail/login.users ] && install -m 0644 etc/login.users $(DESTDIR)$(sysconfdir)/firejail |
| 126 | install -m 0644 etc/login.users $(DESTDIR)$(sysconfdir)/firejail \ | ||
| 127 | fi | ||
| 128 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 126 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
| 129 | # install apparmor profile | 127 | # install apparmor profile |
| 130 | if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ]; then \ | 128 | [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ] && install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d |
| 131 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d \ | ||
| 132 | fi | ||
| 133 | install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d | 129 | install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d |
| 134 | if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ]; then \ | 130 | [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ] && install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local |
| 135 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local \ | ||
| 136 | fi | ||
| 137 | # install apparmor profile customization file | 131 | # install apparmor profile customization file |
| 138 | if [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-local ]; then \ | 132 | [ ! -f $(DESTDIR)$(sysconfdir)/apparmor.d/local/firejail-local ] && install -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local |
| 139 | install -m 0644 etc/apparmor/firejail-local $(DESTDIR)$(sysconfdir)/apparmor.d/local \ | ||
| 140 | fi | ||
| 141 | endif | 133 | endif |
| 142 | # man pages | 134 | # man pages |
| 143 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 | 135 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 |
| @@ -152,10 +144,9 @@ endif | |||
| 152 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) | 144 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) |
| 153 | # bash completion | 145 | # bash completion |
| 154 | install -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions | 146 | install -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions |
| 155 | install -m 0644 -t $(DESTDIR)$(datarootdir)/bash-completions \ | 147 | install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail |
| 156 | src/bash_completion/firejail.bash_completion \ | 148 | install -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon |
| 157 | src/bash_completion/firemon.bash_completion \ | 149 | install -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg |
| 158 | src/bash_completion/firecfg.bash_completion | ||
| 159 | 150 | ||
| 160 | install: all | 151 | install: all |
| 161 | $(MAKE) realinstall | 152 | $(MAKE) realinstall |