[src/trunk]: src/external/cddl/osnet/lib/libdtrace - use CPPFLAGS instead of ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f37d52e7f8dc
branches:  trunk
changeset: 753614:f37d52e7f8dc
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 03 18:34:19 2010 +0000

description:
- use CPPFLAGS instead of CFLAGS
- use relative .PATH

diffstat:

 external/cddl/osnet/lib/libdtrace/Makefile |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 9ac21e22d811 -r f37d52e7f8dc external/cddl/osnet/lib/libdtrace/Makefile
--- a/external/cddl/osnet/lib/libdtrace/Makefile        Sat Apr 03 17:54:24 2010 +0000
+++ b/external/cddl/osnet/lib/libdtrace/Makefile        Sat Apr 03 18:34:19 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/02/24 15:40:54 tron Exp $
+#      $NetBSD: Makefile,v 1.5 2010/04/03 18:34:19 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -52,10 +52,10 @@
                signal.d                \
                unistd.d
 
-.PATH:         ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
-.PATH:         ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
+.PATH:         ${.CURDIR}/../../dist/lib/libgen/common
+.PATH:         ${.CURDIR}/../../dist/lib/libdtrace/common
 
-CFLAGS+=       -I${.OBJDIR} \
+CPPFLAGS+=     -I${.OBJDIR} \
                -I${OSNETDIR}/sys \
                -I${OSNETDIR}/include \
                -I${OPENSOLARIS_USR_DISTDIR}/head \
@@ -83,12 +83,12 @@
 COPTS.dt_subr.c                += -Wno-stack-protector
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-CFLAGS+=       -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == "sparc64"
-CFLAGS+=       -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
+CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .else
 # temporary hack
-CFLAGS+=       -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 LFLAGS+=-l
@@ -105,6 +105,9 @@
 
 beforedepend:  dt_errtags.c dt_names.c
 
+foo:
+       echo ${OPENSOLARIS_USR_DISTDIR}
+
 #beforeinstall:
 #.if exists(${DESTDIR}/usr/lib/dtrace)
 #.for file in ${DSRCS}