diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/pkgxmkmf.in | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 6d797dec566..009e42a295c 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.10362 2005/06/14 18:28:52 abs Exp $ +$NetBSD: CHANGES,v 1.10363 2005/06/14 20:12:53 jlam Exp $ Changes to the packages collection and infrastructure in 2005: @@ -2876,3 +2876,4 @@ Changes to the packages collection and infrastructure in 2005: Updated math/mathomatic to 12.4.2 [minskim 2005-06-14] Updated games/xjig to 2.4nb2 [jmmv 2005-06-14] Updated net/autonet to 0.15 [abs 2005-06-14] + Updated pkgtools/xpkgwedge to 1.14 [jlam 2005-06-14] diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 928453c368f..646235d191d 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2005/06/14 07:23:56 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2005/06/14 20:12:51 jlam Exp $ -DISTNAME= xpkgwedge-1.13 +DISTNAME= xpkgwedge-1.14 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty @@ -38,6 +38,8 @@ FONT_PROGS= bdftopcf fstobdf mkfontdir mkfontscale FILES_SUBST+= VIEWBASE=${VIEWBASE} FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} +FILES_SUBST+= MAKE=${IMAKE_MAKE:Q} +USE_TOOLS+= ${IMAKE_TOOLS} .include "../../mk/x11.buildlink3.mk" diff --git a/pkgtools/xpkgwedge/files/pkgxmkmf.in b/pkgtools/xpkgwedge/files/pkgxmkmf.in index a376530f9b6..c6166cd788d 100644 --- a/pkgtools/xpkgwedge/files/pkgxmkmf.in +++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in @@ -3,7 +3,7 @@ # XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp # XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws # -# $NetBSD: pkgxmkmf.in,v 1.5 2005/06/14 07:23:56 jlam Exp $ +# $NetBSD: pkgxmkmf.in,v 1.6 2005/06/14 20:12:51 jlam Exp $ # # make a Makefile from an Imakefile from inside or outside the sources # with support for config files in ${PREFIX}/lib/X11/config @@ -71,11 +71,11 @@ case "$do_all" in yes) imake $imake_defines $args && echo "make Makefiles" && - make Makefiles && + @MAKE@ Makefiles && echo "make includes" && - make includes && + @MAKE@ includes && echo "make depend" && - make depend + @MAKE@ depend ;; *) imake $imake_defines $args |