Skip to content

Install lessecho into libexecdir #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mavit wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −6
Open

Install lessecho into libexecdir #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ LIBS = $(LIBSAN) @LIBS@
prefix = @prefix@
exec_prefix = @exec_prefix@

# Where the installed binary goes.
# Where the installed binaries go.
bindir = @bindir@
libexecdir = @libexecdir@
binprefix =

sysconfdir = @sysconfdir@
Expand All @@ -49,7 +50,7 @@ SHELL = /bin/sh
# This rule allows us to supply the necessary -D options
# in addition to whatever the user asks for.
.c.o:
${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DLIBEXECDIR=\"${libexecdir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<

OBJ = \
main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
Expand Down Expand Up @@ -83,7 +84,7 @@ screen.${O} ttyin.${O}: pckeys.h
install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
${INSTALL_PROGRAM} less$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
${INSTALL_PROGRAM} lesskey$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
${INSTALL_PROGRAM} lessecho$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
${INSTALL_PROGRAM} lessecho$(EXEEXT) ${DESTDIR}${libexecdir}/${binprefix}lessecho$(EXEEXT)
${INSTALL_DATA} ${srcdir}/less.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
${INSTALL_DATA} ${srcdir}/lesskey.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
${INSTALL_DATA} ${srcdir}/lessecho.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
Expand All @@ -92,12 +93,12 @@ install-strip:
${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install

installdirs: mkinstalldirs
${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man${manext}
${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${libexecdir} ${DESTDIR}${mandir}/man${manext}

uninstall:
rm -f ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
rm -f ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
rm -f ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
rm -f ${DESTDIR}${bindir}/${libexecprefix}lessecho$(EXEEXT)
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
Expand Down
4 changes: 4 additions & 0 deletions filename.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,11 @@ public char * lglob(constant char *afilename)
}
lessecho = lgetenv("LESSECHO");
if (isnullenv(lessecho))
#ifdef LIBEXECDIR
lessecho = LIBEXECDIR "/lessecho";
#else
lessecho = "lessecho";
#endif
/*
* Invoke lessecho, and read its output (a globbed list of filenames).
*/
Expand Down
2 changes: 1 addition & 1 deletion version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ v693 2/14/26 Fix binary file with redirected stdout; fix error messages
make -w/-W hilite on backward movement; show pattern in
"not found" message.
v694 | cmd pipes 1 line if mark is top line; allow numeric arg
on m/M cmds.
on m/M cmds; install lessecho in libexecdir.
*/

char version[] = "694x";