diff options
| author | jlam <jlam> | 2002-10-22 22:54:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-22 22:54:07 +0000 |
| commit | cb041b91339bb6a57949aba37f08ade2fec432f8 (patch) | |
| tree | b2e0bbe58ddf4c76b07e55a3c77e6979267751ba /mk/buildlink2 | |
| parent | d87d1de60d8f4b365fe2e6ad6ad3229bd17ac916 (diff) | |
| download | pkgsrc-cb041b91339bb6a57949aba37f08ade2fec432f8.tar.gz | |
Have USE_IMAKE imply USE_X11BASE imply USE_X11. Now we can just check if
USE_X11 is defined instead of USE_X11 || USE_X11BASE || USE_IMAKE.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index fa33dce0f6d..8e3d70bbb4d 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.42 2002/10/18 15:41:08 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.43 2002/10/22 22:54:09 jlam Exp $ # # An example package buildlink2.mk file: # @@ -65,7 +65,7 @@ _BLNK_OPSYS= ${OPSYS} # CONFIGURE_ENV+= BUILDLINK_UPDATE_CACHE=no -.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE) +.if defined(USE_X11) USE_X11_LINKS?= YES . if !empty(USE_X11_LINKS:M[nN][oO]) . include "../../mk/x11.buildlink2.mk" @@ -284,7 +284,7 @@ _BUILDLINK_USE: .USE _BLNK_TRANSFORM+= I:${LOCALBASE}:${BUILDLINK_DIR} _BLNK_TRANSFORM+= L:${LOCALBASE}:${BUILDLINK_DIR} _BLNK_TRANSFORM+= ${BUILDLINK_TRANSFORM} -.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE) +.if defined(USE_X11) . if !empty(USE_X11_LINKS:M[nN][oO]) _BLNK_TRANSFORM+= I:${X11BASE}:${BUILDLINK_X11PKG_DIR} _BLNK_TRANSFORM+= L:${X11BASE}:${BUILDLINK_X11PKG_DIR} @@ -436,7 +436,7 @@ _BLNK_UNTRANSFORM_SED.3+= ${_BLNK_TRANSFORM_SED.l} # # Fix up references to the x11-links directory. # -.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE) +.if defined(USE_X11) _BLNK_TRANSFORM_SED.4+= \ -e "s|${BUILDLINK_DIR}/\(${BUILDLINK_X11_DIR:S/^${LOCALBASE}\///}\)|${LOCALBASE}/\1|g" _BLNK_UNTRANSFORM_SED.4+= \ @@ -610,7 +610,7 @@ _BLNK_WRAPPEES+= FC PKGLIBTOOL= ${BUILDLINK_LIBTOOL} .endif _BLNK_WRAPPEES+= LIBTOOL -.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE) +.if defined(USE_X11) IMAKE?= ${X11BASE}/bin/imake _BLNK_WRAPPEES+= IMAKE .endif @@ -716,7 +716,7 @@ _BLNK_WRAP_SPECIFIC_LOGIC.LD= ${BUILDLINK_DIR}/bin/.ld-logic # Don't transform the arguments for imake, which uses the C preprocessor # to generate Makefiles, so that imake will find its config files. # -.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE) +.if defined(USE_X11) _BLNK_WRAP_PRE_CACHE.IMAKE= ${_BLNK_WRAP_PRE_CACHE} _BLNK_WRAP_POST_CACHE.IMAKE= ${_BLNK_WRAP_POST_CACHE} _BLNK_WRAP_CACHE.IMAKE= ${_BLNK_WRAP_CACHE} |