diff options
| author | hubertf <hubertf> | 2002-12-11 21:01:05 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2002-12-11 21:01:05 +0000 |
| commit | e8d2c7d0b2886d3973d8fec4dabc1ede14e50f34 (patch) | |
| tree | c5a7db268f4152be9dcda96a84e8e022a3f882b4 /mk | |
| parent | 6c3fb0f7da90e92cc03650bf4d45d188d57c2425 (diff) | |
| download | pkgsrc-e8d2c7d0b2886d3973d8fec4dabc1ede14e50f34.tar.gz | |
* pass BSD_INSTALL to programs, just like the other BSD_INSTALL_* macros,
but _only_ the install program's path.
* check for a few variables before using them.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ecd913cf9fa..9e144395a56 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1105 2002/12/10 13:11:38 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1106 2002/12/11 21:01:05 hubertf Exp $ # # This file is in the public domain. # @@ -204,7 +204,7 @@ PERL5_PKGSRCDIR?= ../../lang/perl5 # _PERL58_PATTERNS contains perl versions >=5.8.0 but before 6.0. _PERL58_PATTERNS= 5.8.* 5.9* 5.[1-9][0-9]* -.if ${_OPSYS_PERL_REQD} != "" +.if defined(_OPSYS_PERL_REQD) && ${_OPSYS_PERL_REQD} != "" _PERL58_REQD?= ${_OPSYS_PERL_REQD} . for _pattern_ in ${_PERL58_PATTERNS} . if !empty(PERL5_REQD:M${_pattern_}) @@ -397,7 +397,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} PATCH_ARGS+= --batch PATCH_DIST_ARGS+= --batch .endif -.if ${_PATCH_CAN_BACKUP} == "yes" +.if defined(_PATCH_CAN_BACKUP) && ${_PATCH_CAN_BACKUP} == "yes" PATCH_ARGS+= ${_PATCH_BACKUP_ARG} .orig PATCH_DIST_ARGS+= ${_PATCH_BACKUP_ARG} .orig .endif @@ -477,6 +477,7 @@ INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ BSD_INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ BSD_INSTALL_DATA="${INSTALL_DATA}" \ BSD_INSTALL_MAN="${INSTALL_MAN}" \ + BSD_INSTALL="${INSTALL}" \ BSD_INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}" \ BSD_INSTALL_SCRIPT_DIR="${INSTALL_SCRIPT_DIR}" \ BSD_INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \ |