From 1b0c8d610f13433a713d447b8781b70fd51158d3 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Tue, 11 Jul 2000 09:31:32 +0000
Subject: Make these packages work better with xpkgwedge by using X11PREFIX in
 preference to X11BASE, and by finding out where the xpm package is installed
 by using pkg_info(1), not hardcoding a best guess.

---
 sysutils/asapm/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 2372ed3d152..d0c30243100 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/07/06 21:09:38 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/11 09:31:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 USE_X11=		yes
 CONFIGURE_ARGS+=	--disable-jpeg	# there actually is no JPEG support
 CONFIGURE_ARGS+=	--with-xpm \
-			--with-xpm-includes="${X11BASE}/include" \
-			--with-xpm-library="${X11BASE}/lib"
+			--with-xpm-includes="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include" \
+			--with-xpm-library="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib"
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3