summaryrefslogtreecommitdiff
path: root/meta-pkgs/xorg/Makefile.common
diff options
context:
space:
mode:
Diffstat (limited to 'meta-pkgs/xorg/Makefile.common')
-rw-r--r--meta-pkgs/xorg/Makefile.common9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index e027ebba3e0..e479d2ac682 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/08/16 12:27:23 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/08/27 06:29:08 jlam Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -145,8 +145,8 @@ USE_LANGUAGES= c c++
. if !target(post-extract)
GLOBAL_LDFLAGS= -L${LOCALBASE}/lib -L${X11ROOT}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
+ ${COMPILER_RPATH_FLAG}${X11BASE}/lib
post-extract:
@${SED} \
@@ -163,8 +163,7 @@ post-extract:
-e "s|@LOCALBASE@|${LOCALBASE}|g" \
-e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \
-e "s|@WRKSRC@|${WRKSRC}|g" \
- -e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG}|g" \
- -e "s|@RPATH_FLAG@|${RPATH_FLAG}|g" \
+ -e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \
${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util