diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/install/bsd.pkginstall.mk (renamed from mk/bsd.pkg.install.mk) | 2 | ||||
| -rw-r--r-- | mk/texinfo.mk | 7 | ||||
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 5 |
4 files changed, 10 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8c0b08b3852..ead7cc46dc9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1635 2005/05/10 20:14:27 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1636 2005/05/11 02:07:37 jlam Exp $ # # This file is in the public domain. # @@ -680,7 +680,7 @@ USE_PKGINSTALL= yes .endif .if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) -. include "../../mk/bsd.pkg.install.mk" +. include "../../mk/install/bsd.pkginstall.mk" .endif # Set INSTALL_FILE to be the name of any INSTALL file diff --git a/mk/bsd.pkg.install.mk b/mk/install/bsd.pkginstall.mk index c403ef04f58..50ffc53e7f8 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.83 2005/05/02 20:33:57 reed Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.1 2005/05/11 02:07:37 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: diff --git a/mk/texinfo.mk b/mk/texinfo.mk index 12cd8394778..af8bedc8144 100644 --- a/mk/texinfo.mk +++ b/mk/texinfo.mk @@ -1,4 +1,4 @@ -# $NetBSD: texinfo.mk,v 1.27 2005/01/15 10:50:18 jmmv Exp $ +# $NetBSD: texinfo.mk,v 1.28 2005/05/11 02:07:37 jlam Exp $ # # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -48,8 +48,9 @@ TEXINFO_MK= # defined # Handle install-info. # -# Use bsd.pkg.install.mk framework i.e. INSTALL/DEINSTALL scripts -# to handle install-info execution. +# Use pkginstall framework i.e. INSTALL/DEINSTALL scripts to handle +# install-info execution. +# USE_PKGINSTALL= YES # Pathname relative to ${PREFIX} of directory holding the info diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index 512ec4e98af..148bc65197a 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.10 2005/03/29 14:39:15 jmmv Exp $ +# $NetBSD: catalogs.mk,v 1.11 2005/05/11 02:07:37 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -44,7 +44,8 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=$c} -- .endif # If there are any entries to register, export required variables and -# use bsd.pkg.install.mk. +# use pkginstall framework. +# .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) FILES_SUBST+= XMLCATMGR="${XMLCATMGR}" FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog" |