Module Name: src
Committed By: plunky
Date: Fri Jun 3 13:31:26 UTC 2011
Modified Files:
src/external/bsd/pcc: Makefile.inc
src/external/bsd/pcc/usr.bin/pcc: Makefile
Log Message:
INCLUDEDIR and LIBEXECDIR only need to be defined for the
pcc front end
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pcc/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pcc/usr.bin/pcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/Makefile.inc
diff -u src/external/bsd/pcc/Makefile.inc:1.11 src/external/bsd/pcc/Makefile.inc:1.12
--- src/external/bsd/pcc/Makefile.inc:1.11 Thu Jun 3 19:17:22 2010
+++ src/external/bsd/pcc/Makefile.inc Fri Jun 3 13:31:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2010/06/03 19:17:22 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.12 2011/06/03 13:31:25 plunky Exp $
PCC_DIR:=${.PARSEDIR}
PCC_DIST=${PCC_DIR}/dist/pcc
@@ -20,13 +20,8 @@
VERSSTR = PACKAGE_STRING " for ${TARGOS}-${TARGMACH}"
-libexecdir = /usr/libexec
-includedir = /usr/include
-
CPPFLAGS+= -DGCC_COMPAT
CPPFLAGS+= -DVERSSTR=${VERSSTR:Q}
-CPPFLAGS+= -DLIBEXECDIR=\"${libexecdir}/\"
-CPPFLAGS+= -DINCLUDEDIR=\"${includedir}/\"
CPPFLAGS+= -Dos_${TARGOS}
CPPFLAGS+= -Dmach_${TARGMACH}
CPPFLAGS+= -I${PCC_DIR}/include
Index: src/external/bsd/pcc/usr.bin/pcc/Makefile
diff -u src/external/bsd/pcc/usr.bin/pcc/Makefile:1.6 src/external/bsd/pcc/usr.bin/pcc/Makefile:1.7
--- src/external/bsd/pcc/usr.bin/pcc/Makefile:1.6 Tue Feb 8 18:26:25 2011
+++ src/external/bsd/pcc/usr.bin/pcc/Makefile Fri Jun 3 13:31:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/02/08 18:26:25 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/03 13:31:25 plunky Exp $
WARNS?= 2
@@ -15,6 +15,8 @@
MAN= pcc.1
CPPFLAGS+= -DTARGMACH=${TARGMACH}
+CPPFLAGS+= -DLIBEXECDIR=\"/usr/libexec/\"
+CPPFLAGS+= -DINCLUDEDIR=\"/usr/include/\"
CPPFLAGS+= -I${PCC_DIST}/mip
CPPFLAGS+= -I${PCC_DIST}/os/${TARGOS}
CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
