pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/expat Don't set BUILDLINK_PREFIX in builtin.m...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ebaadb85337
branches:  trunk
changeset: 548048:8ebaadb85337
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Oct 07 18:03:55 2008 +0000

description:
Don't set BUILDLINK_PREFIX in builtin.mk if we're not using a built-in
version.  D'oh.

diffstat:

 textproc/expat/builtin.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r 137400045f79 -r 8ebaadb85337 textproc/expat/builtin.mk
--- a/textproc/expat/builtin.mk Tue Oct 07 16:03:10 2008 +0000
+++ b/textproc/expat/builtin.mk Tue Oct 07 18:03:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.14 2008/10/07 18:03:55 cube Exp $
 
 BUILTIN_PKG:=  expat
 
@@ -78,12 +78,12 @@
 
 .  if !empty(USE_BUILTIN.expat:M[nN][oO])
 BUILDLINK_API_DEPENDS.expat+=  expat>=1.95.4
-.  endif
-
-.  if !empty(H_EXPAT:M${X11BASE}/*)
-.    include "../../mk/x11.builtin.mk"
 .  else
+.    if !empty(H_EXPAT:M${X11BASE}/*)
+.      include "../../mk/x11.builtin.mk"
+.    else
 BUILDLINK_PREFIX.expat=        /usr
+.    endif
 .  endif
 
 .endif # CHECK_BUILTIN.expat



Home | Main Index | Thread Index | Old Index