All callers of helpfile() are #ifdef SMALL so only define that

function when SMALL is not defined.  OK guenther@

diff --git a/distrib/special/less/Makefile b/distrib/special/less/Makefile
index d258f8b..d2c89b8 100644 (file)
--- 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 3b63194..0b7940f 100644 (file)
--- 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 */