summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2005-01-31 20:14:11 +0000
committerxtraeme <xtraeme>2005-01-31 20:14:11 +0000
commit0e2af2259585008f0dc0810c50fce72603c6cf3a (patch)
tree2cbd4575f6b3ceea84746d9b3422b476c7439ce2 /meta-pkgs
parent36477dc120dc61a368ebaaa40cde0809dad4f104 (diff)
downloadpkgsrc-0e2af2259585008f0dc0810c50fce72603c6cf3a.tar.gz
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.
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/xorg/Makefile.common9
1 files 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