diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2006-07-17 16:41:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2006-07-17 16:41:03 +0000 |
| commit | f62f5679e9d86ec703fa7e3c10147a84e110c7dc (patch) | |
| tree | e431499b0bdb3753ac29ce85329c81bac4448773 /gnu | |
| parent | 7cfd06bd2b22620766244d0230a3c02a74a76948 (diff) | |
let texinfo use whatever makeinfo it wants, preferably the one it just
built, and override MAKEINFOFLAGS for --no-split instead.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/texinfo/Makefile.bsd-wrapper | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper index 773b4d0bad2..549ee53bb22 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.38 2006/07/12 23:00:07 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.39 2006/07/17 16:41:02 espie Exp $ INFODIR= infodir=/usr/share/info INFOPATH= DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:. @@ -8,7 +8,7 @@ MAN+= doc/texindex.1 doc/info.5 doc/texinfo.5 doc/infokey.1 GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" \ ACLOCAL=true AUTOHEADER=true AUTOCONF=true AUTOMAKE=true \ - MAKEINFO='makeinfo --no-split' + MAKEINFOFLAGS='--no-split' FSFMAKE= ${MAKE} ${GNUCFLAGS} ${INFODIR} ${INFOPATH} FSFALL=all-recursive @@ -33,14 +33,12 @@ config: .FORCE PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ CFLAGS="${CFLAGS} ${COPTS}" \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - MAKEINFO='makeinfo --no-split' \ /bin/sh ${.CURDIR}/configure --infodir=/usr/share/info --prefix=/usr --disable-nls ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ CFLAGS="${CFLAGS} ${COPTS}" \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - MAKEINFO='makeinfo --no-split' \ /bin/sh ${.CURDIR}/configure --infodir=/usr/share/info --prefix=/usr --disable-nls ${CF} .ifdef NOMAN |