diff options
| -rw-r--r-- | gnu/usr.bin/cvs/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/Makefile.bsd-wrapper | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/lynx/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/texinfo/Makefile.bsd-wrapper | 4 |
5 files changed, 18 insertions, 12 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper index e4d9effc618..3cffb4d681b 100644 --- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper +++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.30 1999/03/04 03:57:29 niklas Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.31 1999/06/07 00:45:36 deraadt Exp $ .include <bsd.own.mk> MAN= man/cvs.1 man/cvs.5 man/cvsbug.8 -GNUCFLAGS= CFLAGS="${CFLAGS}" +GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" CLEANFILES= lib/getdate.c macintosh/Makefile os2/Makefile doc/CVSvn.texi \ doc/cvs.info doc/cvs.info-1 doc/cvs.info-2 doc/cvs.info-3 \ doc/cvs.info-4 doc/cvs.info-5 doc/cvs.info-6 doc/cvs.info-7 \ diff --git a/gnu/usr.bin/groff/Makefile.bsd-wrapper b/gnu/usr.bin/groff/Makefile.bsd-wrapper index cbc73ac61b5..ea10a878f2a 100644 --- a/gnu/usr.bin/groff/Makefile.bsd-wrapper +++ b/gnu/usr.bin/groff/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.13 1999/03/12 17:35:16 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.14 1999/06/07 00:45:37 deraadt Exp $ # # groff config @@ -9,8 +9,8 @@ FONTDIR= /usr/share/groff_font INDEXDIR= /usr/share/dict/papers COMMON_WORDS= /usr/share/dict/eign -GNUCFLAGS= CFLAGS="${CFLAGS}" -GNUCXXFLAGS= CCFLAGS="${CXXFLAGS}" +GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" +GNUCXXFLAGS= CXX="${CXX}" CCFLAGS="${CXXFLAGS} ${COPTS}" CLEANFILES= config.cache config.log pic/pic.cc eqn/eqn.cc \ refer/label.cc pic/pic.tab.h eqn/eqn.tab.h ${MANALL} @@ -65,12 +65,14 @@ config: .FORCE -rm -f config.cache .endif PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ - INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ + ${GNUCFLAGS} ${GNUCXXFLAGS} \ +INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \ --mandir=${DATASUBDIR}/man ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + ${GNUCFLAGS} ${GNUCXXFLAGS} \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \ --mandir=${DATASUBDIR}/man ${CF} diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper index 9479763daed..2e9ba3af66b 100644 --- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper +++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 1998/12/05 19:43:46 kstailey Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 1999/06/07 00:45:37 deraadt Exp $ MAN= lynx.1 CLEANFILES= lynx.1 -GNUCFLAGS= CFLAGS="${CFLAGS}" +GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" HTMLDIR= /usr/share/doc/html HELPFILES= keystrokes/bookmark_help.html keystrokes/cookie_help.html \ keystrokes/dired_help.html keystrokes/edit_help.html \ @@ -39,11 +39,13 @@ config: .FORCE -rm -f config.cache .endif PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + ${GNUCFLAGS} \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ sh ${.CURDIR}/configure --prefix=/usr --libdir=/etc ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + ${GNUCFLAGS} \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ sh ${.CURDIR}/configure --prefix=/usr --libdir=/etc ${CF} diff --git a/gnu/usr.bin/rcs/Makefile.bsd-wrapper b/gnu/usr.bin/rcs/Makefile.bsd-wrapper index 32cbc8d03d7..e9c26bacc7a 100644 --- a/gnu/usr.bin/rcs/Makefile.bsd-wrapper +++ b/gnu/usr.bin/rcs/Makefile.bsd-wrapper @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.14 1998/10/18 20:02:32 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.15 1999/06/07 00:45:37 deraadt Exp $ MAN= man/ci.1 man/co.1 man/ident.1 man/merge.1 man/rcs.1 man/rcsclean.1 \ man/rcsdiff.1 man/rcsfile.5 man/rcsfreeze.1 man/rcsintro.1 \ man/rcsmerge.1 man/rlog.1 CLEANFILES= man/rcsfile.5 src/conf.h LDFLAGS+= -s ${LDSTATIC} -GNUCFLAGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS}" all: config.status rcsfile.5 ${MAKE} ${GNUCFLAGS} @@ -25,11 +25,13 @@ config: .FORCE -rm -f config.cache .endif PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + ${GNUCFLAGS} \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ sh ${.CURDIR}/configure --with-diffutils --prefix=/usr ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + ${GNUCFLAGS} \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ sh ${.CURDIR}/configure --with-diffutils --prefix=/usr ${CF} diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper index 8bda257ed0c..9cc535633f2 100644 --- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper +++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.28 1999/01/24 18:42:16 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.29 1999/06/07 00:45:37 deraadt Exp $ INFODIR= infodir=${DESTDIR}/usr/share/info INFOPATH= DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:. @@ -7,7 +7,7 @@ CLEANFILES= makeinfo/makeinfo.info info/info.info info/info-stnd.info \ NOMAN= # info.1 manpage passed into obsolescence SUBDIRS= intl lib info makeinfo po util doc -GNUCFLAGS= CFLAGS="${CFLAGS}" +GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" FSFMAKE= ${MAKE} SUBDIRS="${SUBDIRS}" ${GNUCFLAGS} ${INFODIR} \ ${INFOPATH} FSFALL=all-recursive |