diff options
| author | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
| commit | d1c143236383007ebe2b664cf4f20e65f07e995a (patch) | |
| tree | cae588008c2ebc64dfaaf967400630b03c968bdf /databases | |
| parent | be4037a8473c5de66a8b96ac53c9dc59a80855ee (diff) | |
| download | pkgsrc-d1c143236383007ebe2b664cf4f20e65f07e995a.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 'databases')
| -rw-r--r-- | databases/postgresql-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/unixodbc/Makefile | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 117ab1970c8..295e5fba84f 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:39 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -57,9 +57,7 @@ pre-install: ${FALSE}; \ ;; \ esac - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: .for DIR in ${DIRS_TO_BUILD} @@ -71,7 +69,6 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.server` ${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../devel/libgetopt/buildlink.mk" .include "../../databases/postgresql-lib/buildlink.mk" diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 9f9418bf4bf..57d98e83835 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:46 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/02 06:56:40 jlam Exp $ PKGNAME= unixodbc-${ODBC_VERS} ODBC_PKG_VERS= # empty @@ -25,12 +25,10 @@ post-patch: fix-driver-installation pre-install: ${SED} ${FILES_SUBST_SED} ${FILESDIR}/odbcinst.ini.in \ > ${WRKDIR}/odbcinst.ini - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../devel/readline/buildlink.mk" .include "../../mk/bsd.pkg.install.mk" |