From 3f80f22e22ec16ed517397fd303c3df99f9340fc Mon Sep 17 00:00:00 2001
From: Will Miles <wmiles@sgl.com>
Date: Thu, 22 Jan 2015 09:43:28 -0500
Subject: Prioritize local includes and libraries

This fixes #35.
---
 src/libeinfo/Makefile | 2 +-
 src/librc/Makefile    | 2 +-
 src/rc/Makefile       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile
index ec756b47..e6ccb650 100644
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -4,7 +4,7 @@ SRCS=			libeinfo.c
 INCS=			einfo.h
 VERSION_MAP=		einfo.map
 
-CPPFLAGS+=		-I../includes
+LOCAL_CPPFLAGS+=		-I../includes
 
 MK=			../../mk
 include ${MK}/lib.mk
diff --git a/src/librc/Makefile b/src/librc/Makefile
index 73075608..08c599ef 100644
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -7,7 +7,7 @@ VERSION_MAP=	rc.map
 
 LDADD+=		${LIBKVM}
 
-CPPFLAGS+=	-I../includes
+LOCAL_CPPFLAGS+=	-I../includes
 
 MK=		../../mk
 include ${MK}/lib.mk
diff --git a/src/rc/Makefile b/src/rc/Makefile
index d2b2ac5f..fc88ff28 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -35,8 +35,8 @@ RC_SBINLINKS=	mark_service_starting mark_service_started \
 ALL_LINKS=	${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS}
 CLEANFILES+=	${ALL_LINKS}
 
-CPPFLAGS+=	-I../includes -I../librc -I../libeinfo
-LDFLAGS+=	-L../librc -L../libeinfo
+LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
+LOCAL_LDFLAGS=-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo
 
 include ../../Makefile.inc
-- 
cgit v1.2.3