Nicolas Iooss <nicolas.iooss@xxxxxxx> writes: > On Sun, Feb 21, 2021 at 5:04 PM bauen1 <j2468h@xxxxxxxxxxxxxx> wrote: >> >> It is quite useful even to non-privileged users and doesn't require any >> privileges to work, except for maybe -v. >> >> Some tools hard code the old path, so a compatibility symlink is also >> created. >> >> Signed-off-by: Jonathan Hettwer <j2468h@xxxxxxxxx> > > Acked-by: Nicolas Iooss <nicolas.iooss@xxxxxxx> > Merged, thanks! > Thanks! > Nicolas > >> --- >> policycoreutils/sestatus/Makefile | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/policycoreutils/sestatus/Makefile b/policycoreutils/sestatus/Makefile >> index 8c4f45f8..3dbb792b 100644 >> --- a/policycoreutils/sestatus/Makefile >> +++ b/policycoreutils/sestatus/Makefile >> @@ -1,6 +1,7 @@ >> # Installation directories. >> LINGUAS ?= ru >> PREFIX ?= /usr >> +BINDIR ?= $(PREFIX)/bin >> SBINDIR ?= $(PREFIX)/sbin >> MANDIR = $(PREFIX)/share/man >> ETCDIR ?= /etc >> @@ -16,8 +17,13 @@ sestatus: sestatus.o >> install: all >> [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 >> [ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5 >> + -mkdir -p $(DESTDIR)$(BINDIR) >> -mkdir -p $(DESTDIR)$(SBINDIR) >> - install -m 755 sestatus $(DESTDIR)$(SBINDIR) >> + # Some tools hard code /usr/sbin/sestatus ; add a compatibility symlink >> + # install will overwrite a symlink, so create the symlink before calling >> + # install to allow distributions with BINDIR == SBINDIR >> + ln -sf --relative $(DESTDIR)$(BINDIR)/sestatus $(DESTDIR)$(SBINDIR) >> + install -m 755 sestatus $(DESTDIR)$(BINDIR) >> install -m 644 sestatus.8 $(DESTDIR)$(MANDIR)/man8 >> install -m 644 sestatus.conf.5 $(DESTDIR)$(MANDIR)/man5 >> for lang in $(LINGUAS) ; do \ >> -- >> 2.30.1 >>
