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.
This commit is contained in:
parent
e9c4d2d63c
commit
a9639d5208
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user