diff options
Diffstat (limited to 'meta-pkgs/xorg/Makefile.common')
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index c4ca34e9bf0..d7812ad782b 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2005/10/05 00:31:23 reed Exp $ +# $NetBSD: Makefile.common,v 1.36 2005/12/05 20:50:37 rillig Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -124,22 +124,22 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .if !defined(XORG_ONLY_DIRS) || empty(XORG_ONLY_DIRS:M[Yy][Ee][Ss]) -PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ} -PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} -PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} -PLIST_SUBST+= XF86RUSH=${XF86RUSH} -PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS} -PLIST_SUBST+= LIBDRI=${LIBDRI} -PLIST_SUBST+= MAN_DIR=${MAN_DIR} -PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR} -PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX} -PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX} -PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR} -PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX} -PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR} -PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX} -PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR} -PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX} +PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ:Q} +PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q} +PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q} +PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q} +PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q} +PLIST_SUBST+= LIBDRI=${LIBDRI:Q} +PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q} +PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q} +PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q} +PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q} +PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q} +PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q} +PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q} +PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q} +PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q} +PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q} CHECK_X11_TYPE?= yes @@ -156,7 +156,7 @@ X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX} PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :) EGDIR?= ${LOCALBASE}/share/examples/xorg -PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX} +PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q} MESSAGE_SUBST+= X11ROOT=${X11ROOT} .if ${OPSYS} != "Darwin" @@ -269,7 +269,6 @@ post-extract: . for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in . endfor -. undef F . endif . if !target(pre-configure) @@ -285,7 +284,6 @@ pre-configure: ${WRKSRC}/config/cf/${F}.cf.in > \ ${WRKSRC}/config/cf/${F}.cf . endfor -. undef F . endif . if !target(do-configure) |