diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-04-17 11:10:53 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-04-17 11:10:53 +0000 |
| commit | acd03874e8da9c11222bce65cc839b9d5198621e (patch) | |
| tree | 8b9169b3c6f53aa2ffcd40565aaec55d2bc78c72 | |
| parent | d517196e6f8b8fc900a2a19852cebf87b7ad5f41 (diff) | |
| download | pkgsrc-acd03874e8da9c11222bce65cc839b9d5198621e.tar.gz | |
Fix broken includes. Pointed out by kristerw@.
| -rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 6 | ||||
| -rw-r--r-- | misc/XFree86-dirs/Makefile | 3 | ||||
| -rw-r--r-- | misc/XFree86-dirs/dirs.mk | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index 2e0d72f036b..72e4b94a1f6 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/04/14 21:15:01 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.8 2004/04/17 11:10:53 jmmv Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -98,7 +98,7 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .endif # NetBSD -.if !defined(XFREE86_ONLY_DIRS) +.if !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss]) PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} @@ -256,6 +256,6 @@ do-install: .endif # NO_XFREE86_TARGETS -.endif # !defined(XFREE86_ONLY_DIRS) +.endif # !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss]) .endif # !defined(XFREE86_MAKEFILE_COMMON) 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 |