diff options
| author | agc <agc@pkgsrc.org> | 2002-02-07 09:59:48 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2002-02-07 09:59:48 +0000 |
| commit | 840621f7ad59eabaa28c0ba04f592114f291cd4a (patch) | |
| tree | a10f5df306044ca0d06877e9ea02395adf9436bf | |
| parent | 0aedc6e20ba1fe97d2fc23733979f235bbe57a1b (diff) | |
| download | pkgsrc-840621f7ad59eabaa28c0ba04f592114f291cd4a.tar.gz | |
The inclusion of bsd.pkg.mk before the setting of the EXTRA_FILES
definition in the package Makefile caused problems when fetching
files, since bsd.pkg.mk uses a .for loop to iterate over DISTFILES,
thus evaluating ${DISTFILES} at the time the .for line is read -
this caused the EXTRA_FILES definitions not to be fetched. I think
the reason for the inclusion of bsd.pkg.mk in a non-standard place
was to get the values of MACHINE_ARCH and OBJECT_FMT. This all dates
from 1998, and my memory's not what it used to be.
Fix this by getting these values from bsd.prefs.mk, and including
bsd.pkg.mk in the usual place.
| -rw-r--r-- | graphics/xanim/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile index f468ed757b5..9794384cc37 100644 --- a/graphics/xanim/Makefile +++ b/graphics/xanim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/11/29 01:12:36 hubertf Exp $ +# $NetBSD: Makefile,v 1.25 2002/02/07 09:59:48 agc Exp $ DISTNAME= xanim2801 PKGNAME= xanim-2.80.1 @@ -45,7 +45,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xanim ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xanim.0 ${PREFIX}/man/cat1 -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" MACHINE_OBJ_ARCH= ${MACHINE_ARCH}-${OBJECT_FMT} @@ -69,3 +69,5 @@ EXTRA_FILES= xa2.0_cvid_sparcCOFF.o.Z \ EXTRA_FILES= xa2.0_cvid_linuxPPC.o.Z \ xa1.0_cyuv_linuxPPC.o.Z .endif + +.include "../../mk/bsd.pkg.mk" |