aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in6
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac5
3 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index aa008b7dd..ee17ae60c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,14 +18,16 @@ DOCDIR=@docdir@
18HAVE_APPARMOR=@HAVE_APPARMOR@ 18HAVE_APPARMOR=@HAVE_APPARMOR@
19BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ 19BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
20 20
21uids.h:; ./mkuid.sh
22
21.PHONY: mylibs $(MYLIBS) 23.PHONY: mylibs $(MYLIBS)
22mylibs: $(MYLIBS) 24mylibs: $(MYLIBS) uids.h
23$(MYLIBS): 25$(MYLIBS):
24 $(MAKE) -C $@ 26 $(MAKE) -C $@
25 27
26.PHONY: apps $(APPS) 28.PHONY: apps $(APPS)
27apps: $(APPS) 29apps: $(APPS)
28$(APPS): $(MYLIBS) 30$(APPS): $(MYLIBS) uids.h
29 $(MAKE) -C $@ 31 $(MAKE) -C $@
30 32
31$(MANPAGES): $(wildcard src/man/*.txt) 33$(MANPAGES): $(wildcard src/man/*.txt)
diff --git a/configure b/configure
index 7f9fdc3f0..35cd69564 100755
--- a/configure
+++ b/configure
@@ -3763,9 +3763,6 @@ if test "$prefix" = /usr; then
3763 sysconfdir="/etc" 3763 sysconfdir="/etc"
3764fi 3764fi
3765 3765
3766# extract UID_MIN and GID_MIN from login.def
3767./mkuid.sh
3768
3769ac_config_files="$ac_config_files Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile" 3766ac_config_files="$ac_config_files Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile"
3770 3767
3771cat >confcache <<\_ACEOF 3768cat >confcache <<\_ACEOF
@@ -4958,8 +4955,6 @@ echo " file transfer support: $HAVE_FILE_TRANSFER"
4958echo " overlayfs support: $HAVE_OVERLAYFS" 4955echo " overlayfs support: $HAVE_OVERLAYFS"
4959echo " fatal warnings: $HAVE_FATAL_WARNINGS" 4956echo " fatal warnings: $HAVE_FATAL_WARNINGS"
4960echo " busybox workaround: $BUSYBOX_WORKAROUND" 4957echo " busybox workaround: $BUSYBOX_WORKAROUND"
4961printf " uid_min: "; grep UID_MIN uids.h
4962printf " gid_min: "; grep GID_MIN uids.h
4963printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" 4958printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
4964echo 4959echo
4965 4960
diff --git a/configure.ac b/configure.ac
index f4deff7b5..10534c9ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,9 +152,6 @@ if test "$prefix" = /usr; then
152 sysconfdir="/etc" 152 sysconfdir="/etc"
153fi 153fi
154 154
155# extract UID_MIN and GID_MIN from login.def
156./mkuid.sh
157
158AC_OUTPUT(Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile) 155AC_OUTPUT(Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile)
159 156
160echo 157echo
@@ -176,8 +173,6 @@ echo " file transfer support: $HAVE_FILE_TRANSFER"
176echo " overlayfs support: $HAVE_OVERLAYFS" 173echo " overlayfs support: $HAVE_OVERLAYFS"
177echo " fatal warnings: $HAVE_FATAL_WARNINGS" 174echo " fatal warnings: $HAVE_FATAL_WARNINGS"
178echo " busybox workaround: $BUSYBOX_WORKAROUND" 175echo " busybox workaround: $BUSYBOX_WORKAROUND"
179printf " uid_min: "; grep UID_MIN uids.h
180printf " gid_min: "; grep GID_MIN uids.h
181printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" 176printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
182echo 177echo
183 178