diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-14 20:12:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-14 20:12:51 +0000 |
| commit | 2e07c2fb0d5a176a798c5b6dfc0cb8f952fe97b0 (patch) | |
| tree | 34a5d0fe59e9dc56cd73bf710c3a154cb9a362fe /pkgtools | |
| parent | b3c6a77a0321978deeb567d1141e16bbdbf5c0a5 (diff) | |
| download | pkgsrc-2e07c2fb0d5a176a798c5b6dfc0cb8f952fe97b0.tar.gz | |
Update pkgtools/xpkgwedge to 1.14. Changes from 1.13 include using
the make required by the imake config files, which is specified by
${IMAKE_MAKE}. This allows differing make programs to be used for
the main build versus xmkmf.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/pkgxmkmf.in | 8 |
2 files changed, 8 insertions, 6 deletions
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 |