diff options
| author | jlam <jlam@pkgsrc.org> | 2002-11-26 22:46:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-11-26 22:46:59 +0000 |
| commit | 8cf22817fd1d504cd090ba29090e820df483cfa0 (patch) | |
| tree | adac44c8321a4483e186c364e4e84f08d78956df /mk | |
| parent | 0f73c37be23fb5de31d75cb0947b7ed3432b887f (diff) | |
| download | pkgsrc-8cf22817fd1d504cd090ba29090e820df483cfa0.tar.gz | |
Move X11BASE transformations ahead of LOCALBASE transformations to handle
the case where X11BASE is a subdirectory of LOCALBASE, e.g. /usr/pkg/X11R6.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 5859311f5db..e9beddef2e3 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.56 2002/11/26 08:59:06 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.57 2002/11/26 22:46:59 jlam Exp $ # # An example package buildlink2.mk file: # @@ -305,21 +305,15 @@ _BLNK_TRANSFORM+= ${_BLNK_PROTECT} # # Convert direct paths to shared libraries into "-Ldir -llib" equivalents. # -_BLNK_TRANSFORM+= p:${LOCALBASE} _BLNK_TRANSFORM+= p:${X11BASE} +_BLNK_TRANSFORM+= p:${LOCALBASE} _BLNK_TRANSFORM+= p:/usr/lib # # Convert direct paths to static libraries in ${LOCALBASE} or ${X11BASE} # into references into ${BUILDLINK_DIR}. # -_BLNK_TRANSFORM+= static:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} _BLNK_TRANSFORM+= static:${X11BASE}:${_BLNK_MANGLE_DIR.BUILDLINK_X11_DIR} -# -# Transform references into ${LOCALBASE} into ${BUILDLINK_DIR}. -# -_BLNK_TRANSFORM+= ${BUILDLINK_TRANSFORM} -_BLNK_TRANSFORM+= I:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} -_BLNK_TRANSFORM+= L:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} +_BLNK_TRANSFORM+= static:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} # # Transform references into ${X11BASE} into ${BUILDLINK_X11_DIR} but if # the package doesn't use X11, then just remove these references altogether. @@ -330,6 +324,12 @@ _BLNK_TRANSFORM+= L:${X11BASE}:${_BLNK_MANGLE_DIR.BUILDLINK_X11_DIR} .else _BLNK_TRANSFORM+= r:${X11BASE} .endif +# +# Transform references into ${LOCALBASE} into ${BUILDLINK_DIR}. +# +_BLNK_TRANSFORM+= ${BUILDLINK_TRANSFORM} +_BLNK_TRANSFORM+= I:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} +_BLNK_TRANSFORM+= L:${LOCALBASE}:${_BLNK_MANGLE_DIR.BUILDLINK_DIR} .for _localbase_ in /usr/pkg /usr/local . if ${LOCALBASE} != ${_localbase_} _BLNK_TRANSFORM+= r:${_localbase_} |