Set include paths in Makefile instead of .c files

src/rc/Makefile

@@ -10,6 +10,7 @@ TOPDIR=			..
 
 LDFLAGS+=		-L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
 LDADD+=			-lutil -lrc -leinfo
+CPPFLAGS+=		-I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
 
 BINDIR?=		/sbin
 

src/rc/checkpath.c

@@ -43,8 +43,8 @@
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
-#include "../rc-misc.h"
+#include "einfo.h"
+#include "rc-misc.h"
 
 static const char *applet;
 

src/rc/fstabinfo.c

@@ -65,10 +65,10 @@
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 #ifdef HAVE_GETMNTENT
 static struct mntent *getmntfile (const char *file)

src/rc/mountinfo.c

@@ -50,10 +50,10 @@
 #include <regex.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 

src/rc/rc-depend.c

@@ -40,10 +40,10 @@
 #include <string.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 

src/rc/rc-logger.c

@@ -48,9 +48,9 @@
 # include <libutil.h>
 #endif
 
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc-logger.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc.h"
 
 #define LOGFILE RC_SVCDIR "/rc.log"

src/rc/rc-misc.c

@@ -44,8 +44,8 @@
 #include <string.h>
 
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 #define PROFILE_ENV     "/etc/profile.env"
 #define SYS_WHITELIST   RC_LIBDIR "/conf.d/env_whitelist"

src/rc/rc-plugin.c

@@ -41,11 +41,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #define RC_PLUGIN_HOOK "rc_plugin_hook"
 

src/rc/rc-status.c

@@ -36,10 +36,10 @@
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 

src/rc/rc.c

@@ -59,12 +59,12 @@ const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
 #include "rc-logger.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #include "version.h"
 

src/rc/runscript.c

@@ -54,11 +54,11 @@
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #define SELINUX_LIB     RC_LIBDIR "/runscript_selinux.so"
 

src/rc/start-stop-daemon.c

@@ -68,10 +68,10 @@ static struct pam_conv conv = { NULL, NULL};
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 typedef struct schedulelist
 {