diff options
| author | rillig <rillig> | 2007-10-31 12:07:13 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-10-31 12:07:13 +0000 |
| commit | 4bb8a3fc2e937aeb85dc52e89267b7874795e212 (patch) | |
| tree | 0ab603e490a2020495775b83fbe90f2d045d3e36 | |
| parent | 58deb67f99cc7168b69238e8794ca72e297b18ca (diff) | |
| download | pkgsrc-4bb8a3fc2e937aeb85dc52e89267b7874795e212.tar.gz | |
Simpler .include lines.
| -rw-r--r-- | mk/flavor/bsd.flavor.mk | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/flavor.mk | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/mk/flavor/bsd.flavor.mk b/mk/flavor/bsd.flavor.mk index 385d3a77d53..289b2a38479 100644 --- a/mk/flavor/bsd.flavor.mk +++ b/mk/flavor/bsd.flavor.mk @@ -1,7 +1,7 @@ -# $NetBSD: bsd.flavor.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: bsd.flavor.mk,v 1.2 2007/10/31 12:07:13 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and pulls in the correct # target and variable overrides for the selected package system flavor. # -.include "${PKGSRCDIR}/mk/flavor/${PKG_FLAVOR}/flavor.mk" +.include "${PKG_FLAVOR}/flavor.mk" diff --git a/mk/flavor/pkg/flavor.mk b/mk/flavor/pkg/flavor.mk index 57f1cb3d06d..7a02205a453 100644 --- a/mk/flavor/pkg/flavor.mk +++ b/mk/flavor/pkg/flavor.mk @@ -1,4 +1,4 @@ -# $NetBSD: flavor.mk,v 1.2 2007/08/14 23:58:24 joerg Exp $ +# $NetBSD: flavor.mk,v 1.3 2007/10/31 12:07:13 rillig Exp $ # # This Makefile fragment provides variable and target overrides that are # specific to the pkgsrc native package format. @@ -15,13 +15,13 @@ PKG_FILELIST_CMD= ${PKG_INFO} -qL ${PKGNAME:Q} PKG_FILELIST_CMD= ${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST} .endif -.include "${PKGSRCDIR}/mk/flavor/pkg/depends.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/check.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/metadata.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/install.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/deinstall.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/replace.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/package.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/views.mk" +.include "depends.mk" +.include "check.mk" +.include "metadata.mk" +.include "install.mk" +.include "deinstall.mk" +.include "replace.mk" +.include "package.mk" +.include "views.mk" -.include "${PKGSRCDIR}/mk/flavor/pkg/utility.mk" +.include "utility.mk" |