kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorder the inclusion of bsd.pkg.install.mk so that it appears *before*

Browse source 
texinfo.mk.  This ensures that {,DE}INSTALL_EXTRA_TMPL isn't defined by
texinfo.mk before bsd.pkg.install.mk checks those variables.
This commit is contained in:
jlam 2003-08-30 20:52:09 +00:00
parent da9ece1ae1
commit e19b751d03
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mk/bsd.pkg.mk
View file

@ -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.
#