d7133c7185
- Do not use Python slip - dbus: use GLib.MainLoop - fixfiles: do not exclude /dev and /run in -C mode
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From d36c5c43d17896ebd655f8bdc6e0303dcbf2f47b Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Mosnacek <omosnace@redhat.com>
|
|
Date: Fri, 19 Mar 2021 22:30:59 +0100
|
|
Subject: [PATCH] policycoreutils/setfiles: do not create useless
|
|
setfiles.8.man file
|
|
|
|
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@redhat.com>
|
|
---
|
|
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 5e899c95af23..000000000000
|
|
--- a/policycoreutils/setfiles/.gitignore
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-setfiles.8.man
|
|
diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile
|
|
index a3bbbe116b7f..63d818509791 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.31.1
|
|
|