From 3123e90a107ca6f782b24e0332828ba3f781e663 Mon Sep 17 00:00:00 2001
From: skrll <skrll>
Date: Mon, 23 Apr 2001 08:26:01 +0000
Subject: Pass CXX down in MAKE_ENV rather than hardcoding g++. This makes
 libtool happy.

Noted in recent i386 bulk build.
---
 comms/plp/Makefile         | 4 +++-
 comms/plp/distinfo         | 4 ++--
 comms/plp/patches/patch-af | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'comms/plp')

diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 6a1a99d6c45..bc0a160515f 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:56:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/04/23 08:26:01 skrll Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -12,6 +12,8 @@ COMMENT=	Tools to talk to the PSION organiser
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
+MAKE_ENV+=	REALCXX="${CXX}"
+
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/utils/libplputils.la ${PREFIX}/lib
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/ncp/ncp ${PREFIX}/bin
diff --git a/comms/plp/distinfo b/comms/plp/distinfo
index ca9e8837f31..908d8f72ecc 100644
--- a/comms/plp/distinfo
+++ b/comms/plp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/22 17:43:18 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/04/23 08:26:01 skrll Exp $
 
 SHA1 (plp_1_8.tar.gz) = cad586353091895b6efc556d2cb5fa16891a3749
 Size (plp_1_8.tar.gz) = 58424 bytes
@@ -7,6 +7,6 @@ SHA1 (patch-ab) = 41314372a3f5f5723393c0cf42c20d4257b170b6
 SHA1 (patch-ac) = 794a00264cd61d31b61a2f05d81424e05f2e065e
 SHA1 (patch-ad) = 5831a7043380f3cc1dcccc029e54874003475632
 SHA1 (patch-ae) = 4ed426d60618302fa5d996d45d2b5be69e3e7faf
-SHA1 (patch-af) = 3397dbb6f1a9ef441db5d4ddc28a4e1bc9458f57
+SHA1 (patch-af) = 4b8fb86953e9c508c60340d0d6eb0bd52c32221f
 SHA1 (patch-ag) = 354183a25f00d951e5cbc25e64b11b1daac21939
 SHA1 (patch-ah) = e0a90f7f8f70ab94f252af28d0d6ecbb878265df
diff --git a/comms/plp/patches/patch-af b/comms/plp/patches/patch-af
index 7147b76e464..3caf1c847fb 100644
--- a/comms/plp/patches/patch-af
+++ b/comms/plp/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2001/04/22 17:43:19 skrll Exp $
+$NetBSD: patch-af,v 1.4 2001/04/23 08:26:01 skrll Exp $
 
 --- Makefile.orig	Tue Nov  2 21:05:02 1999
 +++ Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.3 2001/04/22 17:43:19 skrll Exp $
  INCLUDE=-I../utils
  CFLAGS= -Wall -g -O2
 -CC=g++ $(CFLAGS) $(INCLUDE)
-+CC=$(LIBTOOL) --mode=compile g++ $(CFLAGS) $(INCLUDE)
++CC=$(LIBTOOL) --mode=compile $(REALCXX) $(CFLAGS) $(INCLUDE)
  
  # Linker and flags
 -LIBDIR=-L../utils
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2001/04/22 17:43:19 skrll Exp $
 -# Archiver
 -AR=ar -cr
 +LIBS=../utils/libplputils.la
-+LD=$(LIBTOOL) --mode=link g++
++LD=$(LIBTOOL) --mode=link $(REALCXX)
  
  #######################################
  # You shouldn't need to look any further..
-- 
cgit v1.2.3