summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1997-05-23 08:38:46 +0000
committerasami <asami@FreeBSD.org>1997-05-23 08:38:46 +0000
commita9639d5208f4fc5d64fa284770d9eeb73ca94433 (patch)
tree28523a8001694168fe44bc98a42bceb30db1ea89
parente9c4d2d63c02013ecc7b19feefb9f7437ee10a96 (diff)
downloadFreeBSD-src-a9639d5208f4fc5d64fa284770d9eeb73ca94433.zip
FreeBSD-src-a9639d5208f4fc5d64fa284770d9eeb73ca94433.tar.gz
Change CXXINCLUDES to use "g++" explicitly. CXXINCLUDES was defined
with ${CXX} at the end; the only problem was, the directory name is "g++" and ${CXX} is defined as "c++" in sys.mk.
-rw-r--r--share/mk/bsd.lib.mk4
-rw-r--r--share/mk/bsd.prog.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 31091f4..7b41dd3 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $Id: bsd.lib.mk,v 1.54 1997/04/23 10:26:18 bde Exp $
+# $Id: bsd.lib.mk,v 1.55 1997/05/04 21:30:40 jdp Exp $
#
.if exists(${.CURDIR}/../Makefile.inc)
@@ -13,7 +13,7 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
-CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
+CXXINCLUDES+= -I${DESTDIR}/usr/include/g++
.endif
.if defined(DEBUG_FLAGS)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 36291f4..cc146d2 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.prog.mk,v 1.48 1997/04/19 14:36:49 bde Exp $
+# $Id: bsd.prog.mk,v 1.49 1997/04/23 18:47:42 bde Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -10,7 +10,7 @@
CFLAGS+=${COPTS} ${DEBUG_FLAGS}
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
-CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
+CXXINCLUDES+= -I${DESTDIR}/usr/include/g++
.endif
.if !defined(DEBUG_FLAGS)
OpenPOWER on IntegriCloud