From 2bd4c46727ed19ba464eb22bdc566b9768fd9ae4 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Sun, 20 Sep 1998 03:27:19 +0000
Subject: Append "-idirafter ${DESTDIR}/usr/include/g++" to CPPFLAGS if DESTDIR
 is specified so we can find gcc-installed c++ includes.  dm@openbsd.org

---
 gnu/lib/libg++/libg++/Makefile.bsd-wrapper    | 5 ++++-
 gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/lib/libg++/libg++/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
index a85785157ad..0fd7c1c8ac5 100644
--- a/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.10 1998/06/07 23:22:11 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.11 1998/09/20 03:27:17 millert Exp $
 
 .if defined(OBJMACHINE)
 OBJDIR=	obj.${MACHINE}
@@ -95,5 +95,8 @@ includes:
 		$$i $(DESTDIR)/usr/include/g++/$$i; \
 	done
 
+.if defined(DESTDIR)
+CPPFLAGS+= -idirafter ${DESTDIR}/usr/include/g++
+.endif
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
index 3a3f96f30ea..547fa57ffbd 100644
--- a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.8 1998/03/03 21:42:46 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.9 1998/09/20 03:27:18 millert Exp $
 
 IO_DIR=		$(.CURDIR)/../libio
 LIBIBERTY_DIR=	$(.CURDIR)/../libiberty
@@ -423,4 +423,8 @@ ldcomio.so: cinst.cc $(STD_DIR)/complext.h $(STD_DIR)/complext.cc \
 	@$(LD) -x -r ldcomio.so.o -o ldcomio.so
 	@rm -f ldcomio.so.o
 
+.if defined(DESTDIR)
+CPPFLAGS+= -idirafter ${DESTDIR}/usr/include/g++
+.endif
+
 .include <bsd.lib.mk>
-- 
cgit v1.2.3