[pkgsrc/trunk]: pkgsrc/mk Don't quote X11BASE using :Q. It had weird effects,...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d9ec5e42a26
branches:  trunk
changeset: 497608:0d9ec5e42a26
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 31 23:54:04 2005 +0000

description:
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.

diffstat:

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

diffs (23 lines):

diff -r 975fbd9dc7fc -r 0d9ec5e42a26 mk/x11.buildlink3.mk
--- a/mk/x11.buildlink3.mk      Sun Jul 31 22:46:15 2005 +0000
+++ b/mk/x11.buildlink3.mk      Sun Jul 31 23:54:04 2005 +0000
@@ -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 @@
 .  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}