diff options
| author | jlam <jlam> | 2003-08-30 22:57:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-30 22:57:05 +0000 |
| commit | bc0dc0b6f3e966e5af0b123b4dbf86af9d2617d6 (patch) | |
| tree | 32cadaf814bb42d36f1b0f0272bfc613f6ee75ec /mk | |
| parent | 4b8f6a2bd697469ac0942748929c7d396e4b1a68 (diff) | |
| download | pkgsrc-bc0dc0b6f3e966e5af0b123b4dbf86af9d2617d6.tar.gz | |
Back out last revision since we modified bsd.pkg.install.mk to require
that {,DE}INSTALL_EXTRA_TMPL to be set if a package Makefile wants to use
them.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9a7e210183b..22e275ff19d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1249 2003/08/30 20:52:09 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1250 2003/08/30 22:57:05 jlam Exp $ # # This file is in the public domain. # @@ -559,6 +559,14 @@ PLIST_SUBST+= PERL5_SITEARCH=${PERL5_SITEARCH:S/^${LOCALBASE}\///} PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///} .endif +# Handle info files +# +INFO_FILES?= # default to no info files to handle +USE_MAKEINFO?= no # default to not using makeinfo +.if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO]) +. include "../../mk/texinfo.mk" +.endif + .if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) . include "../../mk/bsd.pkg.install.mk" .endif @@ -573,14 +581,6 @@ INSTALL_FILE= ${PKGDIR}/INSTALL DEINSTALL_FILE= ${PKGDIR}/DEINSTALL .endif -# Handle info files -# -INFO_FILES?= # default to no info files to handle -USE_MAKEINFO?= no # default to not using makeinfo -.if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO]) -. include "../../mk/texinfo.mk" -.endif - # If MESSAGE hasn't been defined, then set MESSAGE_SRC to be a space-separated # list of files to be concatenated together to generate the MESSAGE file. # |