diff options
| author | dmcmahill <dmcmahill> | 2002-01-22 18:15:20 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2002-01-22 18:15:20 +0000 |
| commit | 498b1e8eb77e9b046dd14ff72db1d6b4e11d15bc (patch) | |
| tree | d0fccb8297ade561e21294089f7ff1358aa42eb7 /mk | |
| parent | 1b9f65c67feef6e6551a46a690a138623defb19a (diff) | |
| download | pkgsrc-498b1e8eb77e9b046dd14ff72db1d6b4e11d15bc.tar.gz | |
make sure FFLAGS ends up in MAKE_ENV as well as BUILD_DEFS. This allows you
to do
make FFLAGS='-my -f -flags'
and at least the pkgs which obey FFLAGS use them.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b4e861527e4..9ccd2858263 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.910 2002/01/21 21:09:41 zuntum Exp $ +# $NetBSD: bsd.pkg.mk,v 1.911 2002/01/22 18:15:20 dmcmahill Exp $ # # This file is in the public domain. # @@ -338,7 +338,7 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" M4="${M4}" YACC="${YACC}" MAKE_FLAGS?= MAKEFILE?= Makefile -MAKE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +MAKE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" FFLAGS="${FFLAGS}" .if exists(${ZOULARISBASE}/bin/ftp) # Zoularis FETCH_CMD?= ${ZOULARISBASE}/bin/ftp @@ -1098,7 +1098,7 @@ install-depends check-depends: # Add these defs to the ones dumped into +BUILD_DEFS BUILD_DEFS+= PKGPATH BUILD_DEFS+= OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH -BUILD_DEFS+= CPPFLAGS CFLAGS LDFLAGS +BUILD_DEFS+= CPPFLAGS CFLAGS FFLAGS LDFLAGS BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS BUILD_DEFS+= OBJECT_FMT LICENSE RESTRICTED BUILD_DEFS+= NO_SRC_ON_FTP NO_SRC_ON_CDROM @@ -1747,7 +1747,7 @@ do-configure: ${_CONFIGURE_PREREQ} . if defined(HAS_CONFIGURE) ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} \ CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ - CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ + CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" FC="${FC}" F77="${FC}" FFLAGS="${FFLAGS}" \ INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \ ac_given_INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ |