Move policycoreutils/restorecond to restorecond.

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

.gitignore

@@ -24,3 +24,4 @@ cscope.*
 .*.swp
 # Failsafes
 !.gitignore
+restorecond/restorecond

Makefile

@@ -2,6 +2,12 @@ SUBDIRS=libsepol libselinux libsemanage sepolgen checkpolicy secilc policycoreut
 PYSUBDIRS=libselinux libsemanage
 DISTCLEANSUBDIRS=libselinux libsemanage
 
+INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+
+ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
+	SUBDIRS += restorecond
+endif
+
 ifeq ($(DEBUG),1)
 	export CFLAGS = -g3 -O0 -gdwarf-2 -fno-strict-aliasing -Wall -Wshadow -Werror
 	export LDFLAGS = -g

policycoreutils/.gitignore

@@ -1,6 +1,5 @@
 load_policy/load_policy
 newrole/newrole
-restorecond/restorecond
 run_init/open_init_pty
 run_init/run_init
 secon/secon

policycoreutils/Makefile

@@ -1,11 +1,5 @@
 SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man hll
 
-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-
-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-	SUBDIRS += restorecond
-endif
-
 all install relabel clean indent:
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \

restorecond/Makefile

@@ -16,8 +16,10 @@ SELINUXDIR = $(DESTDIR)/etc/selinux
 DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
 DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)
 
+SETFILESDIR ?= ../policycoreutils/setfiles
+
 CFLAGS ?= -g -Werror -Wall -W
-override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS)
+override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I$(SETFILESDIR)
 
 USE_PCRE2 ?= n
 ifeq ($(USE_PCRE2),y)
@@ -32,7 +34,7 @@ all: restorecond
 
 restorecond.o utmpwatcher.o stringslist.o user.o watch.o: restorecond.h
 
-restorecond:  ../setfiles/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
+restorecond:  $(SETFILESDIR)/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all

restorecond/restorecond.c

@@ -55,7 +55,7 @@
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include "../setfiles/restore.h"
+#include "restore.h"
 #include <sys/types.h>
 #include <syslog.h>
 #include <limits.h>