diff options
| author | rillig <rillig> | 2008-01-04 01:46:24 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2008-01-04 01:46:24 +0000 |
| commit | b37ccd21553fccf7042ed7af80646be3f26b4d6b (patch) | |
| tree | 09fab4af7837547a826b3008a949a7856dd3f7b8 /mk/tools | |
| parent | cab7723f76fefa3e378af0675370ca3086b20890 (diff) | |
| download | pkgsrc-b37ccd21553fccf7042ed7af80646be3f26b4d6b.tar.gz | |
Made the .include directives simpler, since the directory of the
including file is always the first in the search path.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/bsd.tools.mk | 36 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 4 |
2 files changed, 20 insertions, 20 deletions
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index 0891bae49e9..eaae98cd9e9 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.48 2007/12/18 10:18:40 markd Exp $ +# $NetBSD: bsd.tools.mk,v 1.49 2008/01/04 01:46:27 rillig Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -146,23 +146,23 @@ post-tools: @${DO_NADA} .endif -.include "${PKGSRCDIR}/mk/tools/digest.mk" -.include "${PKGSRCDIR}/mk/tools/automake.mk" -.include "${PKGSRCDIR}/mk/tools/autoconf.mk" -.include "${PKGSRCDIR}/mk/tools/texinfo.mk" -.include "${PKGSRCDIR}/mk/tools/gettext.mk" -.include "${PKGSRCDIR}/mk/tools/intltool.mk" -.include "${PKGSRCDIR}/mk/tools/ldconfig.mk" -.include "${PKGSRCDIR}/mk/tools/rpcgen.mk" -.include "${PKGSRCDIR}/mk/tools/strip.mk" -.include "${PKGSRCDIR}/mk/tools/cmake.mk" -.include "${PKGSRCDIR}/mk/tools/imake.mk" -.include "${PKGSRCDIR}/mk/tools/replace.mk" -.include "${PKGSRCDIR}/mk/tools/perl.mk" -.include "${PKGSRCDIR}/mk/tools/pkg-config.mk" -.include "${PKGSRCDIR}/mk/tools/make.mk" - -.include "${PKGSRCDIR}/mk/tools/create.mk" +.include "digest.mk" +.include "automake.mk" +.include "autoconf.mk" +.include "texinfo.mk" +.include "gettext.mk" +.include "intltool.mk" +.include "ldconfig.mk" +.include "rpcgen.mk" +.include "strip.mk" +.include "cmake.mk" +.include "imake.mk" +.include "replace.mk" +.include "perl.mk" +.include "pkg-config.mk" +.include "make.mk" + +.include "create.mk" _VARGROUPS+= tools _USER_VARS.tools= TOOLS_SHELL diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index f4f9e15a55e..ef150704416 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.203 2007/12/18 10:18:49 markd Exp $ +# $NetBSD: replace.mk,v 1.204 2008/01/04 01:46:27 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1182,7 +1182,7 @@ TOOLS_PATH.xmkmf= ${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf # Compute the locations of the pkgsrc-supplied tools. FIND_PREFIX:= ${TOOLS_FIND_PREFIX} -.include "${PKGSRCDIR}/mk/find-prefix.mk" +.include "../find-prefix.mk" ###################################################################### |