On Wed, Apr 21, 2021 at 10:27 AM Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote: > > On Fri, Mar 19, 2021 at 10:32 PM Ondrej Mosnacek <omosnace@xxxxxxxxxx> wrote: > > > > Seems to have been there to allow for some sed substitution over the > > text. Now that this is gone, the redundant intermediate file can be > > removed, too. > > > > Signed-off-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx> > > Hello, > It seems nobody reviewed this patch, and it looks good to me. So if > nobody complains, I will merge it tomorrow. > > Acked-by: Nicolas Iooss <nicolas.iooss@xxxxxxx> Merged. Thanks, Nicolas > > --- > > policycoreutils/setfiles/.gitignore | 1 - > > policycoreutils/setfiles/Makefile | 9 +++------ > > 2 files changed, 3 insertions(+), 7 deletions(-) > > delete mode 100644 policycoreutils/setfiles/.gitignore > > > > diff --git a/policycoreutils/setfiles/.gitignore b/policycoreutils/setfiles/.gitignore > > deleted file mode 100644 > > index 5e899c95..00000000 > > --- a/policycoreutils/setfiles/.gitignore > > +++ /dev/null > > @@ -1 +0,0 @@ > > -setfiles.8.man > > diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile > > index a3bbbe11..63d81850 100644 > > --- a/policycoreutils/setfiles/Makefile > > +++ b/policycoreutils/setfiles/Makefile > > @@ -13,7 +13,7 @@ ifeq ($(AUDITH), y) > > override LDLIBS += -laudit > > endif > > > > -all: setfiles restorecon restorecon_xattr man > > +all: setfiles restorecon restorecon_xattr > > > > setfiles: setfiles.o restore.o > > > > @@ -22,16 +22,13 @@ restorecon: setfiles > > > > restorecon_xattr: restorecon_xattr.o restore.o > > > > -man: > > - @cp -af setfiles.8 setfiles.8.man > > - > > install: all > > [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 > > -mkdir -p $(DESTDIR)$(SBINDIR) > > install -m 755 setfiles $(DESTDIR)$(SBINDIR) > > (cd $(DESTDIR)$(SBINDIR) && ln -sf setfiles restorecon) > > install -m 755 restorecon_xattr $(DESTDIR)$(SBINDIR) > > - install -m 644 setfiles.8.man $(DESTDIR)$(MANDIR)/man8/setfiles.8 > > + install -m 644 setfiles.8 $(DESTDIR)$(MANDIR)/man8/setfiles.8 > > install -m 644 restorecon.8 $(DESTDIR)$(MANDIR)/man8/restorecon.8 > > install -m 644 restorecon_xattr.8 $(DESTDIR)$(MANDIR)/man8/restorecon_xattr.8 > > for lang in $(LINGUAS) ; do \ > > @@ -42,7 +39,7 @@ install: all > > done > > > > clean: > > - rm -f setfiles restorecon restorecon_xattr *.o setfiles.8.man > > + rm -f setfiles restorecon restorecon_xattr *.o > > > > indent: > > ../../scripts/Lindent $(wildcard *.[ch]) > > -- > > 2.30.2 > >
