aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-06-04 15:45:56 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-06-04 15:45:56 -0400
commitac9283365224ed46ab2087c050ae1e2916a0dbf5 (patch)
treeecc9d148454b06e928a242ff5037462239e1a28d /Makefile.in
parentadd private-cache option (diff)
downloadfirejail-ac9283365224ed46ab2087c050ae1e2916a0dbf5.tar.gz
firejail-ac9283365224ed46ab2087c050ae1e2916a0dbf5.tar.zst
firejail-ac9283365224ed46ab2087c050ae1e2916a0dbf5.zip
evaluate UID_MIN/GID_MID at runtime, remove compile time evaluation - fixes #1964
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index fef544267..cbcf252df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,16 +22,14 @@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
22BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ 22BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
23HAVE_SUID=@HAVE_SUID@ 23HAVE_SUID=@HAVE_SUID@
24 24
25uids.h:; ./mkuid.sh
26
27.PHONY: mylibs $(MYLIBS) 25.PHONY: mylibs $(MYLIBS)
28mylibs: $(MYLIBS) 26mylibs: $(MYLIBS)
29$(MYLIBS): uids.h 27$(MYLIBS):
30 $(MAKE) -C $@ 28 $(MAKE) -C $@
31 29
32.PHONY: apps $(APPS) 30.PHONY: apps $(APPS)
33apps: $(APPS) 31apps: $(APPS)
34$(APPS): $(MYLIBS) uids.h 32$(APPS): $(MYLIBS)
35 $(MAKE) -C $@ 33 $(MAKE) -C $@
36 34
37$(MANPAGES): $(wildcard src/man/*.txt) 35$(MANPAGES): $(wildcard src/man/*.txt)
@@ -73,7 +71,7 @@ distclean: clean
73 for dir in $(APPS) $(MYLIBS); do \ 71 for dir in $(APPS) $(MYLIBS); do \
74 $(MAKE) -C $$dir distclean; \ 72 $(MAKE) -C $$dir distclean; \
75 done 73 done
76 rm -fr Makefile autom4te.cache config.log config.status config.h uids.h dummy.o src/common.mk 74 rm -fr Makefile autom4te.cache config.log config.status config.h dummy.o src/common.mk
77 75
78realinstall: 76realinstall:
79 # firejail executable 77 # firejail executable
@@ -192,7 +190,7 @@ uninstall:
192 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon 190 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
193 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg 191 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
194 192
195DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" 193DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh COPYING README RELNOTES"
196DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot" 194DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot"
197 195
198dist: 196dist: