Commit 85f43838 authored by Niels Möller's avatar Niels Möller
Browse files

(LIBEXEC_PROGRAMS): New variable, listing

programs that are moved to libexec, lsh-transport, lshd-userauth,
lshd-connection and lshd-pty-helper.
(environ.h): Substitute localstatedir.
(install): Install $(LIBEXEC_PROGRAMS).
(tags-here): Put TAGS file in source directory.

Rev: src/Makefile.in:1.46
parent c5caf8f2
......@@ -32,14 +32,17 @@ SCHEME = $(SCHEME_PROGRAM) -l $(srcdir)/scm/$(SCHEME_NAME)-compat.scm
# Missing: @KRB_PROGRAM@ @PAM_PROGRAM@
BIN_PROGRAMS = lsh$(EXEEXT) lsh-transport$(EXEEXT) \
BIN_PROGRAMS = lsh$(EXEEXT) \
lsh-keygen$(EXEEXT) lsh-decrypt-key$(EXEEXT) \
lsh-decode-key$(EXEEXT) lsh-export-key$(EXEEXT) lsh-make-seed$(EXEEXT)
SBIN_PROGRAMS = lshd$(EXEEXT) lshd-userauth$(EXEEXT) lshd-connection$(EXEEXT) \
lshd-pty-helper$(EXEEXT)
SBIN_PROGRAMS = lshd$(EXEEXT)
TARGETS = $(BIN_PROGRAMS) $(SBIN_PROGRAMS)
LIBEXEC_PROGRAMS = lsh-transport$(EXEEXT) \
lshd-userauth$(EXEEXT) lshd-connection$(EXEEXT) \
lshd-pty-helper$(EXEEXT)
TARGETS = $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(LIBEXEC_PROGRAMS)
SCRIPTS = lsh-authorize ssh-conv lsh-upgrade lsh-upgrade-key lcp lshg
......@@ -264,6 +267,7 @@ environ.h: environ.h.in Makefile
-e 's,@''bindir@,$(bindir),' \
-e 's,@''sbindir@,$(sbindir),' \
-e 's,@''libexecdir@,$(libexecdir),' \
-e 's,@''localstatedir@,$(localstatedir),' \
-e 's,@''sysconfdir@,$(sysconfdir),' \
< $(srcdir)/environ.h.in) >environ.hT
test -s environ.hT && mv -f environ.hT environ.h
......@@ -323,9 +327,10 @@ lshd-pty-helper$(EXEEXT): $(lshd_pty_helper_OBJS)
$(LINK) $(lshd_pty_helper_OBJS) $(LIBS) -o $@
# Currently, all scripts are in the source directory.
install: $(BIN_PROGRAMS) $(SBIN_PROGRAMS)
install: $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(LIBEXEC_PROGRAMS)
$(MKDIR_P) $(DESTDIR)$(bindir)
$(MKDIR_P) $(DESTDIR)$(sbindir)
$(MKDIR_P) $(DESTDIR)$(libexecdir)
for f in $(BIN_PROGRAMS) ; do \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir) ; \
done
......@@ -335,6 +340,9 @@ install: $(BIN_PROGRAMS) $(SBIN_PROGRAMS)
for f in $(SBIN_PROGRAMS) ; do \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(sbindir) ; \
done
for f in $(LIBEXEC_PROGRAMS) ; do \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(libexecdir) ; \
done
uninstall:
cd $(DESTDIR)$(bindir) && rm -f $(BIN_PROGRAMS) $(SCRIPTS)
......@@ -364,7 +372,7 @@ maintainer-clean-here:
-rm -f $(generated_sources)
tags-here:
etags $(srcdir)/*.c $(srcdir)/*.h
etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h
# Standard targets
Makefile: $(srcdir)/Makefile.in ../config.status
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment