From de1ecba6eaf8c7d57a3d179410c8a157bc9df74b Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sun, 31 Jul 2005 23:54:04 +0000
Subject: Don't quote X11BASE using :Q. It had weird effects, including build
 failure of audio/bmp. This needs to be investigated further. See the comment
 in the file.

---
 mk/x11.buildlink3.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk
index 56e7ed49527..21812041784 100644
--- a/mk/x11.buildlink3.mk
+++ b/mk/x11.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.2 2005/07/28 16:20:52 jlam Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.3 2005/07/31 23:54:04 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require an X11 distribution.  x11.buildlink3.mk will include the
@@ -15,8 +15,11 @@ USE_X11=	yes
 .  include "../../mk/x11.version.mk"
 
 .  if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
-CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q}
+# XXX when X11BASE is quoted using :Q here, audio/bmp does not build
+# XXX because the $ disappears, leaving {DESTDIR}/usr/X11R6/include.
+# XXX Can someone please explain this?
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 .  endif
 
 X11_LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
-- 
cgit v1.2.3