Hack to allow libg++ to compile properly when DESTDIR is defined.

This involves adding -I${DESTDIR}/usr/include/${CXX} to the
compiler flags when C++ code is being compiled.

This needs to be revisited for 2.0.

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index fdf7938..2a6d5d1 100644 (file)
--- 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
 #      from: @(#)bsd.lib.mk    5.26 (Berkeley) 5/2/91

-#      $Id: bsd.lib.mk,v 1.35 1994/05/27 03:02:17 jkh Exp $
+#      $Id: bsd.lib.mk,v 1.36 1994/05/28 09:50:56 csgr Exp $

 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)


@@ -13,6 +13,7 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 
 .if defined(DESTDIR)
 CFLAGS+= -I${DESTDIR}/usr/include
 
 .if defined(DESTDIR)
 CFLAGS+= -I${DESTDIR}/usr/include

+CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}

 .endif
 INSTALL?=      install
 LIBDIR?=       /usr/lib
 .endif
 INSTALL?=      install
 LIBDIR?=       /usr/lib

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 044dd6a..3cae487 100644 (file)
--- 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
 #      from: @(#)bsd.prog.mk   5.26 (Berkeley) 6/25/91

-#      $Id: bsd.prog.mk,v 1.21 1994/04/19 17:16:00 jkh Exp $
+#      $Id: bsd.prog.mk,v 1.22 1994/06/07 15:49:24 csgr Exp $

 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"


@@ -10,6 +10,7 @@
 CFLAGS+=${COPTS}
 .if defined(DESTDIR)
 CFLAGS+= -I${DESTDIR}/usr/include
 CFLAGS+=${COPTS}
 .if defined(DESTDIR)
 CFLAGS+= -I${DESTDIR}/usr/include

+CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}

 .endif
 
 STRIP?=        -s
 .endif
 
 STRIP?=        -s

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 1c8b8be..a7a9a0b 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #      from: @(#)sys.mk        5.11 (Berkeley) 3/13/91
 #      from: @(#)sys.mk        5.11 (Berkeley) 3/13/91

-#      $Id: sys.mk,v 1.5 1994/02/04 03:19:16 wollman Exp $
+#      $Id: sys.mk,v 1.6 1994/05/23 05:45:56 phk Exp $

 
 unix=          We run FreeBSD, not UNIX.
 
 
 unix=          We run FreeBSD, not UNIX.
 


@@ -18,7 +18,7 @@ CC=           cc
 CFLAGS=                -O
 
 CXX=           g++
 CFLAGS=                -O
 
 CXX=           g++

-CXXFLAGS=      ${CFLAGS}
+CXXFLAGS=      ${CXXINCLUDES} ${CFLAGS}

 
 CPP=           cpp
 
 
 CPP=           cpp