From faa42016d731868415b671ed1b744549734a922f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 29 Jun 2001 18:27:30 +0000
Subject: Update xpkgwedge to 1.3.  Changes from version 1.2 are adding a
 section triggered by the definition of "BuildLink" that forces
 ${BUILDLINK_DIR} to be searched ahead of ${LOCALBASE} and ${X11BASE} for
 headers and libraries.

---
 pkgtools/xpkgwedge/Makefile            |  4 ++--
 pkgtools/xpkgwedge/files/xpkgwedge.def | 30 +++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index a3a39df8e16..29b667c073c 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2001/06/18 05:17:14 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/29 18:27:30 jlam Exp $
 #
 
-DISTNAME=	xpkgwedge-1.2
+DISTNAME=	xpkgwedge-1.3
 CATEGORIES=	pkgtools devel x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def
index c7e33e8a270..791a1de197a 100644
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def
@@ -1,4 +1,4 @@
-/*	$NetBSD: xpkgwedge.def,v 1.5 2001/06/16 08:53:49 veego Exp $	*/
+/*	$NetBSD: xpkgwedge.def,v 1.6 2001/06/29 18:27:30 jlam Exp $	*/
 
 #ifdef AfterVendorCF
 
@@ -63,4 +63,32 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #define ImakeCmd imake -I$(PREFIX)/lib/X11/config
 #endif
 
+#ifdef BuildLink
+/*
+ * Force the buildlink include and lib directories to the head of the
+ * compiler search paths.  The include directory is added through the
+ * C{,plusplus}DebugFlags, which are the first options given to the
+ * compiler.  It is _required_ that BUILDLINK_DIR be defined in the
+ * environment.
+ */
+#ifdef UseInstalled
+# ifndef BuildLinkCppFlags
+# define BuildLinkCppFlags -I$(BUILDLINK_DIR)/include $(PKGSRC_CPPFLAGS)
+# endif
+# ifndef BuildLinkLdFlags
+# define BuildLinkLdFlags -L$(BUILDLINK_DIR)/lib
+# endif
+# undef DependFlags
+# define DependFlags BuildLinkCppFlags
+# undef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CFLAGS)
+# undef OptimizedCplusplusDebugFlags
+# define OptimizedCplusplusDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CXXFLAGS)
+# undef LdPreLib
+# define LdPreLib BuildLinkLdFlags
+# undef LdPostLib
+# define LdPostLib BuildLinkLdFlags
 #endif
+#endif /* BuildLink */
+
+#endif /* AfterVendorCF */
-- 
cgit v1.2.3