summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-04-17 11:10:53 +0000
committerjmmv <jmmv@pkgsrc.org>2004-04-17 11:10:53 +0000
commitf5899c170e31cf4f6d7fdd96e7e114c4f8f37eb1 (patch)
tree8b9169b3c6f53aa2ffcd40565aaec55d2bc78c72 /misc
parentd13714169a624bbe04aa560b79f7ebc51460c36c (diff)
downloadpkgsrc-f5899c170e31cf4f6d7fdd96e7e114c4f8f37eb1.tar.gz
Fix broken includes. Pointed out by kristerw@.
Diffstat (limited to 'misc')
-rw-r--r--misc/XFree86-dirs/Makefile3
-rw-r--r--misc/XFree86-dirs/dirs.mk8
2 files changed, 7 insertions, 4 deletions
diff --git a/misc/XFree86-dirs/Makefile b/misc/XFree86-dirs/Makefile
index 206afbf8461..4d73c02011f 100644
--- a/misc/XFree86-dirs/Makefile
+++ b/misc/XFree86-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/17 11:10:53 jmmv Exp $
#
DISTNAME= XFree86-dirs-1.0
@@ -29,5 +29,4 @@ MAKE_DIRS+= ${_SORTED:S/^/${X11ROOT}\//}
do-install: # nothing
-.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk
index 279eb97e521..89b6d3c42f1 100644
--- a/misc/XFree86-dirs/dirs.mk
+++ b/misc/XFree86-dirs/dirs.mk
@@ -1,10 +1,14 @@
-# $NetBSD: dirs.mk,v 1.1 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.2 2004/04/17 11:10:53 jmmv Exp $
#
.if !defined(DIRS_XFREE86_MK)
DIRS_XFREE86_MK= # defined
-.include "../../misc/XFree86-dirs/Makefile.common"
+oldval:= ${XFREE86_ONLY_DIRS}
+XFREE86_ONLY_DIRS:= YES
+.include "../../meta-pkgs/XFree86/Makefile.common"
+XFREE86_ONLY_DIRS:= ${oldval}
+.undef oldval
XFREE86_DIRS= bin
XFREE86_DIRS+= include