diff options
| author | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
| commit | f99697d915e447ed9abcf7aca31b0c873ea53734 (patch) | |
| tree | cae588008c2ebc64dfaaf967400630b03c968bdf /sysutils | |
| parent | 77f7fc5d39245d400e8ec79fa531f29c951fa641 (diff) | |
| download | pkgsrc-f99697d915e447ed9abcf7aca31b0c873ea53734.tar.gz | |
bsd.pkg.install.mk calls the INSTALL script at the right times
automatically, so no need to do it ourselves.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/amanda-common/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/ups-nut/Makefile | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 5eec1c5adfe..7c1099308d0 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/26 20:38:32 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/12/02 06:56:44 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -40,11 +40,5 @@ PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH} OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700 -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index f1efe442964..03b2f59c9eb 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/26 20:38:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:44 jlam Exp $ # DISTNAME= nut-0.45.2 @@ -64,7 +64,6 @@ pre-install: ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ > ${WRKDIR}/$${script}; \ done - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: for script in ${RCD_SCRIPTS}; do \ @@ -77,7 +76,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" |