|
 |
5b70e6 |
From 6cfebe787e258c4c62dbf2018d0a08bc8b70e445 Mon Sep 17 00:00:00 2001
|
|
|
5b70e6 |
From: Ondrej Mosnacek <omosnace@redhat.com>
|
|
|
5b70e6 |
Date: Fri, 19 Mar 2021 22:30:59 +0100
|
|
|
5b70e6 |
Subject: [PATCH] policycoreutils/setfiles: do not create useless
|
|
|
5b70e6 |
setfiles.8.man file
|
|
|
5b70e6 |
|
|
|
5b70e6 |
Seems to have been there to allow for some sed substitution over the
|
|
|
5b70e6 |
text. Now that this is gone, the redundant intermediate file can be
|
|
|
5b70e6 |
removed, too.
|
|
|
5b70e6 |
|
|
|
5b70e6 |
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
|
|
|
5b70e6 |
---
|
|
|
5b70e6 |
policycoreutils/setfiles/.gitignore | 1 -
|
|
|
5b70e6 |
policycoreutils/setfiles/Makefile | 9 +++------
|
|
|
5b70e6 |
2 files changed, 3 insertions(+), 7 deletions(-)
|
|
|
5b70e6 |
delete mode 100644 policycoreutils/setfiles/.gitignore
|
|
|
5b70e6 |
|
|
|
5b70e6 |
diff --git a/policycoreutils/setfiles/.gitignore b/policycoreutils/setfiles/.gitignore
|
|
|
5b70e6 |
deleted file mode 100644
|
|
|
5b70e6 |
index 5e899c95af23..000000000000
|
|
|
5b70e6 |
--- a/policycoreutils/setfiles/.gitignore
|
|
|
5b70e6 |
+++ /dev/null
|
|
|
5b70e6 |
@@ -1 +0,0 @@
|
|
|
5b70e6 |
-setfiles.8.man
|
|
|
5b70e6 |
diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile
|
|
|
5b70e6 |
index a3bbbe116b7f..63d818509791 100644
|
|
|
5b70e6 |
--- a/policycoreutils/setfiles/Makefile
|
|
|
5b70e6 |
+++ b/policycoreutils/setfiles/Makefile
|
|
|
5b70e6 |
@@ -13,7 +13,7 @@ ifeq ($(AUDITH), y)
|
|
|
5b70e6 |
override LDLIBS += -laudit
|
|
|
5b70e6 |
endif
|
|
|
5b70e6 |
|
|
|
5b70e6 |
-all: setfiles restorecon restorecon_xattr man
|
|
|
5b70e6 |
+all: setfiles restorecon restorecon_xattr
|
|
|
5b70e6 |
|
|
|
5b70e6 |
setfiles: setfiles.o restore.o
|
|
|
5b70e6 |
|
|
|
5b70e6 |
@@ -22,16 +22,13 @@ restorecon: setfiles
|
|
|
5b70e6 |
|
|
|
5b70e6 |
restorecon_xattr: restorecon_xattr.o restore.o
|
|
|
5b70e6 |
|
|
|
5b70e6 |
-man:
|
|
|
5b70e6 |
- @cp -af setfiles.8 setfiles.8.man
|
|
|
5b70e6 |
-
|
|
|
5b70e6 |
install: all
|
|
|
5b70e6 |
[ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
|
|
|
5b70e6 |
-mkdir -p $(DESTDIR)$(SBINDIR)
|
|
|
5b70e6 |
install -m 755 setfiles $(DESTDIR)$(SBINDIR)
|
|
|
5b70e6 |
(cd $(DESTDIR)$(SBINDIR) && ln -sf setfiles restorecon)
|
|
|
5b70e6 |
install -m 755 restorecon_xattr $(DESTDIR)$(SBINDIR)
|
|
|
5b70e6 |
- install -m 644 setfiles.8.man $(DESTDIR)$(MANDIR)/man8/setfiles.8
|
|
|
5b70e6 |
+ install -m 644 setfiles.8 $(DESTDIR)$(MANDIR)/man8/setfiles.8
|
|
|
5b70e6 |
install -m 644 restorecon.8 $(DESTDIR)$(MANDIR)/man8/restorecon.8
|
|
|
5b70e6 |
install -m 644 restorecon_xattr.8 $(DESTDIR)$(MANDIR)/man8/restorecon_xattr.8
|
|
|
5b70e6 |
for lang in $(LINGUAS) ; do \
|
|
|
5b70e6 |
@@ -42,7 +39,7 @@ install: all
|
|
|
5b70e6 |
done
|
|
|
5b70e6 |
|
|
|
5b70e6 |
clean:
|
|
|
5b70e6 |
- rm -f setfiles restorecon restorecon_xattr *.o setfiles.8.man
|
|
|
5b70e6 |
+ rm -f setfiles restorecon restorecon_xattr *.o
|
|
|
5b70e6 |
|
|
|
5b70e6 |
indent:
|
|
|
5b70e6 |
../../scripts/Lindent $(wildcard *.[ch])
|
|
|
5b70e6 |
--
|
|
|
5b70e6 |
2.32.0
|
|
|
5b70e6 |
|