diff options
author | netblue30 <netblue30@yahoo.com> | 2016-09-19 09:09:09 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-09-19 09:09:09 -0400 |
commit | 528e3a6916e753f34d63d13234dc9f3d3a1a3ebb (patch) | |
tree | 50e8db575e588733655e329bcc046a6d75c461b3 | |
parent | bug: preserve config.status during make dist (diff) | |
download | firejail-528e3a6916e753f34d63d13234dc9f3d3a1a3ebb.tar.gz firejail-528e3a6916e753f34d63d13234dc9f3d3a1a3ebb.tar.zst firejail-528e3a6916e753f34d63d13234dc9f3d3a1a3ebb.zip |
moved uids.h processing from configure to Makefile.in
-rw-r--r-- | Makefile.in | 6 | ||||
-rwxr-xr-x | configure | 5 | ||||
-rw-r--r-- | configure.ac | 5 |
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@ | |||
18 | HAVE_APPARMOR=@HAVE_APPARMOR@ | 18 | HAVE_APPARMOR=@HAVE_APPARMOR@ |
19 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 19 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |
20 | 20 | ||
21 | uids.h:; ./mkuid.sh | ||
22 | |||
21 | .PHONY: mylibs $(MYLIBS) | 23 | .PHONY: mylibs $(MYLIBS) |
22 | mylibs: $(MYLIBS) | 24 | mylibs: $(MYLIBS) uids.h |
23 | $(MYLIBS): | 25 | $(MYLIBS): |
24 | $(MAKE) -C $@ | 26 | $(MAKE) -C $@ |
25 | 27 | ||
26 | .PHONY: apps $(APPS) | 28 | .PHONY: apps $(APPS) |
27 | apps: $(APPS) | 29 | apps: $(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) |
@@ -3763,9 +3763,6 @@ if test "$prefix" = /usr; then | |||
3763 | sysconfdir="/etc" | 3763 | sysconfdir="/etc" |
3764 | fi | 3764 | fi |
3765 | 3765 | ||
3766 | # extract UID_MIN and GID_MIN from login.def | ||
3767 | ./mkuid.sh | ||
3768 | |||
3769 | ac_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" | 3766 | ac_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 | ||
3771 | cat >confcache <<\_ACEOF | 3768 | cat >confcache <<\_ACEOF |
@@ -4958,8 +4955,6 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
4958 | echo " overlayfs support: $HAVE_OVERLAYFS" | 4955 | echo " overlayfs support: $HAVE_OVERLAYFS" |
4959 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 4956 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
4960 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 4957 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
4961 | printf " uid_min: "; grep UID_MIN uids.h | ||
4962 | printf " gid_min: "; grep GID_MIN uids.h | ||
4963 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 4958 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
4964 | echo | 4959 | echo |
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" |
153 | fi | 153 | fi |
154 | 154 | ||
155 | # extract UID_MIN and GID_MIN from login.def | ||
156 | ./mkuid.sh | ||
157 | |||
158 | AC_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) | 155 | AC_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 | ||
160 | echo | 157 | echo |
@@ -176,8 +173,6 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
176 | echo " overlayfs support: $HAVE_OVERLAYFS" | 173 | echo " overlayfs support: $HAVE_OVERLAYFS" |
177 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 174 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
178 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 175 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
179 | printf " uid_min: "; grep UID_MIN uids.h | ||
180 | printf " gid_min: "; grep GID_MIN uids.h | ||
181 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 176 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
182 | echo | 177 | echo |
183 | 178 | ||