diff options
| author |   millert <millert@openbsd.org> | 2014-05-13 02:34:58 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2014-05-13 02:34:58 +0000 |
| commit | 654cc61aff1e91002a09d2e23d99e87bf7403f90 (patch) | |
| tree | c8ae6242b526bf281c2ed67e838f99f52e2a3259 | |
| parent | Refactors "dummyrun" flag as "dryrun" with an approach similar to the one used (diff) | |
| download | wireguard-openbsd-654cc61aff1e91002a09d2e23d99e87bf7403f90.tar.xz wireguard-openbsd-654cc61aff1e91002a09d2e23d99e87bf7403f90.zip | |
All callers of helpfile() are #ifdef SMALL so only define that
function when SMALL is not defined. OK guenther@
| -rw-r--r-- | distrib/special/less/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/less/main.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/distrib/special/less/Makefile b/distrib/special/less/Makefile index d258f8bd433..d2c89b82969 100644 --- a/distrib/special/less/Makefile +++ b/distrib/special/less/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2014/05/10 18:15:31 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2014/05/13 02:34:58 millert Exp $ PROG= less SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ decode.c edit.c filename.c forwback.c ifile.c input.c jump.c \ line.c linenum.c mark.c optfunc.c option.c opttbl.c os.c output.c \ pattern.c position.c prompt.c search.c signal.c ttyin.c version.c -CFLAGS= ${PIPE} ${DEBUG} -I${.CURDIR} -DHELPDIR=\"${HELPDIR}\" +CFLAGS= ${PIPE} ${DEBUG} -I${.CURDIR} DPADD= ${LIBOCURSES} LDADD= -locurses diff --git a/usr.bin/less/main.c b/usr.bin/less/main.c index 3b63194f689..0b7940f5e4d 100644 --- a/usr.bin/less/main.c +++ b/usr.bin/less/main.c @@ -421,8 +421,10 @@ quit(status) exit(status); } +#if !SMALL public char * helpfile(void) { return (less_is_more ? HELPDIR "/more.help" : HELPDIR "/less.help"); } +#endif /* !SMALL */ |