[pkgsrc/trunk]: pkgsrc/mk Reorder the inclusion of bsd.pkg.install.mk so that...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dd649b3e0d3
branches:  trunk
changeset: 460468:3dd649b3e0d3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 30 20:52:09 2003 +0000

description:
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:

 mk/bsd.pkg.mk |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 2506e8d30d92 -r 3dd649b3e0d3 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Aug 30 20:51:49 2003 +0000
+++ b/mk/bsd.pkg.mk     Sat Aug 30 20:52:09 2003 +0000
@@ -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_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 @@
 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.
 #