diff options
| author | jlam <jlam> | 2005-06-14 07:23:56 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-14 07:23:56 +0000 |
| commit | 8811989423385571691c94b13feadfc3f69cbb42 (patch) | |
| tree | 0fa6a9d342478406721dfdbd815e94977804962f /pkgtools | |
| parent | 4f48297accd9e82fb66b224747d303089edb8856 (diff) | |
| download | pkgsrc-8811989423385571691c94b13feadfc3f69cbb42.tar.gz | |
Update pkgtools/xpkgwedge to 1.13. Changes from version 1.12 include
invoking the make(1) program as "make" instead of hardcoding the
(wrong) path in ${MAKE_PROGRAM}. This will rely on the tools framework
to have set up "make" to properly call the correct make(1) program.
This should fix cases where pkgxmkmf called the wrong make(1) program
on Linux systems.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/pkgxmkmf.in | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index d62bdd9f00a..928453c368f 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2005/06/01 18:03:08 jlam Exp $ +# $NetBSD: Makefile,v 1.57 2005/06/14 07:23:56 jlam Exp $ -DISTNAME= xpkgwedge-1.12 +DISTNAME= xpkgwedge-1.13 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty @@ -38,7 +38,6 @@ FONT_PROGS= bdftopcf fstobdf mkfontdir mkfontscale FILES_SUBST+= VIEWBASE=${VIEWBASE} FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} -FILES_SUBST+= MAKE=${MAKE_PROGRAM:Q} .include "../../mk/x11.buildlink3.mk" diff --git a/pkgtools/xpkgwedge/files/pkgxmkmf.in b/pkgtools/xpkgwedge/files/pkgxmkmf.in index 9a7da82aeb1..a376530f9b6 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.4 2004/01/03 23:34:21 jlam Exp $ +# $NetBSD: pkgxmkmf.in,v 1.5 2005/06/14 07:23:56 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 |