diff options
| author | jlam <jlam@pkgsrc.org> | 2003-08-30 20:52:09 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-08-30 20:52:09 +0000 |
| commit | e19b751d03c8296c1265018930f46cc22c486dfd (patch) | |
| tree | 6383c711a7b62d6dc630f762f20488cf8e0536cf /mk | |
| parent | da9ece1ae12afe56fb08ba41486da339aba9bf58 (diff) | |
| download | pkgsrc-e19b751d03c8296c1265018930f46cc22c486dfd.tar.gz | |
Reorder the inclusion of bsd.pkg.install.mk so that it appears *before*
texinfo.mk. This ensures that {,DE}INSTALL_EXTRA_TMPL isn't defined by
texinfo.mk before bsd.pkg.install.mk checks those variables.
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 aa75ba7eb5f..9a7e210183b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1248 2003/08/27 11:29:56 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1249 2003/08/30 20:52:09 jlam Exp $ # # This file is in the public domain. # @@ -559,14 +559,6 @@ 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 @@ -581,6 +573,14 @@ 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. # |