diff options
author | jlam <jlam@pkgsrc.org> | 2003-01-28 22:03:00 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2003-01-28 22:03:00 +0000 |
commit | d7f69e47ce32be7271733bcdf48d28468f400ab9 (patch) | |
tree | d3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /wm | |
parent | 63fd8d49cc206089921ed7d972b87faff07efbe6 (diff) | |
download | pkgsrc-d7f69e47ce32be7271733bcdf48d28468f400ab9.tar.gz |
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES". This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile. Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/ion/Makefile | 4 | ||||
-rw-r--r-- | wm/pwm/Makefile | 4 | ||||
-rw-r--r-- | wm/windowmaker/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/wm/ion/Makefile b/wm/ion/Makefile index d0216076c25..d80d2424921 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/12/22 21:33:14 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:22 jlam Exp $ # DISTNAME= ion-20010523 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.students.tut.fi/~tuomov/ion/ COMMENT= keyboard friendly tiling window manager USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11BASE= YES USE_GMAKE= YES @@ -29,5 +30,4 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f # PKG_SYSCONFSUBDIR we are currently using. MAKE_ENV= PKG_SYSCONFBASE="${PKG_SYSCONFBASE}" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index b5c11b3e9a3..21c1594dee4 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:36 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:23 jlam Exp $ # DISTNAME= pwm-1.0 @@ -10,6 +10,7 @@ HOMEPAGE= http://www.students.tut.fi/~tuomov/pwm/ COMMENT= Window manager that frames multiple client windows in a single frame USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11= YES USE_GMAKE= YES MAKE_ENV+= SYSCONFDIR="${PKG_SYSCONFDIR}" @@ -30,5 +31,4 @@ SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} post-install: ${RM} -f ${EGDIR}/sample.conf -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 29d3f4e79b6..ca803a47386 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/01/08 19:56:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2003/01/28 22:04:24 jlam Exp $ VERS= 0.80.2 DISTNAME= WindowMaker-${VERS} @@ -16,6 +16,7 @@ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -90,7 +91,6 @@ post-install: .include "../../graphics/tiff/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" # "egcs" has an optimizer problem on "arm32". |