diff options
| author | he <he> | 2008-06-08 21:04:30 +0000 |
|---|---|---|
| committer | he <he> | 2008-06-08 21:04:30 +0000 |
| commit | 1ef88c5ab844515e3a2d89ceef95eeeb88f163b8 (patch) | |
| tree | b846e7196c75b3e12e04f3399b05e38a054b6ce5 /pkgtools | |
| parent | 905f915158a6e9d1e00a018ea12ba36d55d909d0 (diff) | |
| download | pkgsrc-1ef88c5ab844515e3a2d89ceef95eeeb88f163b8.tar.gz | |
Commit two fixes which at least for me appear to be required when
doing an old-style bulk build on 4.0 or older systems:
- in mk/bulk/build, do "make update" instead of "make install + clean"
when installing a new pkg_install
- in pkgtools/pkg_install/Makefile, don't try to use our own
executables (${WORKDIR}/pkg_add/pkg_add etc.) if they don't exist
Discussed with joerg, and even though he's not entirely happy
with the latter change, he didn't appear to have a better suggestion.
This, and putting /usr/pkg/sbin earlier than /usr/sbin in the $PATH
appears to be required to get an old-style bulk build going.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 8c51f1ff345..197af353eb0 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2008/06/02 16:40:25 joerg Exp $ +# $NetBSD: Makefile,v 1.154 2008/06/08 21:04:30 he Exp $ # Notes to package maintainers: # @@ -53,10 +53,12 @@ CHECK_PERMS= no # from an older pkg_install might required features of the new program. # USE_NATIVE_GCC= yes +.if exists(${WRKSRC}/add/pkg_add) PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete PKG_INFO_CMD= ${WRKSRC}/info/pkg_info +.endif CPPFLAGS+= -D_LARGEFILE_SOURCE -D_LARGE_FILES CPPFLAGS+= -D_FILE_OFFSET_BITS=64 |