diff options
author | Slava Monich <slava.monich@jolla.com> | 2020-10-03 01:50:26 +0300 |
---|---|---|
committer | Slava Monich <slava.monich@jolla.com> | 2020-10-03 01:50:26 +0300 |
commit | 99a210d4bb8bb53cd6bdff5ceb44a466988760f0 (patch) | |
tree | 32573a2eb14460479eef1275009e3a9513f2c54a | |
parent | temporary fix for nvidia/nogroups/noroot issue (#3644, #841) (diff) | |
download | firejail-99a210d4bb8bb53cd6bdff5ceb44a466988760f0.tar.gz firejail-99a210d4bb8bb53cd6bdff5ceb44a466988760f0.tar.zst firejail-99a210d4bb8bb53cd6bdff5ceb44a466988760f0.zip |
added configure option to disable man pages
Those are unnecessary in embedded environment.
-rw-r--r-- | Makefile.in | 12 | ||||
-rwxr-xr-x | configure | 16 |
2 files changed, 26 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index e1abdcc5f..fbd3c4a07 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -14,12 +14,18 @@ HAVE_APPARMOR=@HAVE_APPARMOR@ | |||
14 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | 14 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ |
15 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 15 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |
16 | HAVE_SUID=@HAVE_SUID@ | 16 | HAVE_SUID=@HAVE_SUID@ |
17 | NEED_MAN=@NEED_MAN@ | ||
17 | 18 | ||
18 | all: all_items mydirs man filters | 19 | ifneq ($(NEED_MAN),no) |
20 | MAN_TARGET = man | ||
21 | MAN_SRC = src/man | ||
22 | endif | ||
23 | |||
24 | all: all_items mydirs $(MAN_TARGET) filters | ||
19 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats | 25 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats |
20 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee | 26 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee |
21 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter | 27 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter |
22 | MYDIRS = src/lib src/man | 28 | MYDIRS = src/lib $(MAN_SRC) |
23 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so | 29 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so |
24 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 | 30 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 |
25 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp | 31 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp |
@@ -133,6 +139,7 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | |||
133 | # install apparmor profile customization file | 139 | # install apparmor profile customization file |
134 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;" | 140 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;" |
135 | endif | 141 | endif |
142 | ifneq ($(NEED_MAN),no) | ||
136 | # man pages | 143 | # man pages |
137 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 | 144 | install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 |
138 | for man in $(MANPAGES); do \ | 145 | for man in $(MANPAGES); do \ |
@@ -144,6 +151,7 @@ endif | |||
144 | esac; \ | 151 | esac; \ |
145 | done | 152 | done |
146 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) | 153 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) |
154 | endif | ||
147 | # bash completion | 155 | # bash completion |
148 | install -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions | 156 | install -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions |
149 | install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail | 157 | install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail |
@@ -630,6 +630,7 @@ CPP | |||
630 | HAVE_SELINUX | 630 | HAVE_SELINUX |
631 | HAVE_CONTRIB_INSTALL | 631 | HAVE_CONTRIB_INSTALL |
632 | HAVE_GCOV | 632 | HAVE_GCOV |
633 | NEED_MAN | ||
633 | BUSYBOX_WORKAROUND | 634 | BUSYBOX_WORKAROUND |
634 | HAVE_FATAL_WARNINGS | 635 | HAVE_FATAL_WARNINGS |
635 | HAVE_SUID | 636 | HAVE_SUID |
@@ -721,6 +722,7 @@ enable_whitelist | |||
721 | enable_suid | 722 | enable_suid |
722 | enable_fatal_warnings | 723 | enable_fatal_warnings |
723 | enable_busybox_workaround | 724 | enable_busybox_workaround |
725 | enable_man | ||
724 | enable_gcov | 726 | enable_gcov |
725 | enable_contrib_install | 727 | enable_contrib_install |
726 | enable_selinux | 728 | enable_selinux |
@@ -1377,6 +1379,7 @@ Optional Features: | |||
1377 | --enable-fatal-warnings -W -Wall -Werror | 1379 | --enable-fatal-warnings -W -Wall -Werror |
1378 | --enable-busybox-workaround | 1380 | --enable-busybox-workaround |
1379 | enable busybox workaround | 1381 | enable busybox workaround |
1382 | --enable-man generate and install man pages | ||
1380 | --enable-gcov Gcov instrumentation | 1383 | --enable-gcov Gcov instrumentation |
1381 | --enable-contrib-install | 1384 | --enable-contrib-install |
1382 | install contrib scripts | 1385 | install contrib scripts |
@@ -3693,6 +3696,18 @@ if test "x$enable_busybox_workaround" = "xyes"; then : | |||
3693 | 3696 | ||
3694 | fi | 3697 | fi |
3695 | 3698 | ||
3699 | NEED_MAN="yes" | ||
3700 | # Check whether --enable-man was given. | ||
3701 | if test "${enable_man+set}" = set; then : | ||
3702 | enableval=$enable_man; | ||
3703 | fi | ||
3704 | |||
3705 | if test "x$enable_man" = "xno"; then : | ||
3706 | |||
3707 | NEED_MAN="no" | ||
3708 | |||
3709 | |||
3710 | fi | ||
3696 | 3711 | ||
3697 | HAVE_GCOV="" | 3712 | HAVE_GCOV="" |
3698 | # Check whether --enable-gcov was given. | 3713 | # Check whether --enable-gcov was given. |
@@ -5412,6 +5427,7 @@ echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | |||
5412 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | 5427 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" |
5413 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 5428 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
5414 | echo " Gcov instrumentation: $HAVE_GCOV" | 5429 | echo " Gcov instrumentation: $HAVE_GCOV" |
5430 | echo " Generate and install man pages: $NEED_MAN" | ||
5415 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | 5431 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" |
5416 | echo " SELinux labeling support: $HAVE_SELINUX" | 5432 | echo " SELinux labeling support: $HAVE_SELINUX" |
5417 | echo " Install as a SUID executable: $HAVE_SUID" | 5433 | echo " Install as a SUID executable: $HAVE_SUID" |