From 0e2af2259585008f0dc0810c50fce72603c6cf3a Mon Sep 17 00:00:00 2001 From: xtraeme Date: Mon, 31 Jan 2005 20:14:11 +0000 Subject: Always copy the file DragonFly.cf unconditionally into xc/config/cf, otherwise the post-extract target will fail. This closes PR pkg/29169 and pkg/29135, thanks. --- meta-pkgs/xorg/Makefile.common | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index cc3a2d7eea7..5314c52a2a3 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2005/01/25 17:49:57 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.17 2005/01/31 20:14:11 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -211,13 +211,10 @@ post-extract: @${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf @${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf -.if ${OPSYS} == "DragonFly" - @${CP} ../../x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf/ -.endif + @${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf . for F in ${SYSTEMS} - @${MV} ${WRKSRC}/config/cf/${F}.cf \ - ${WRKSRC}/config/cf/${F}.cf.in + @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in . endfor . undef F -- cgit v1.2.3