mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

Makefile: Install subdaemons into pkglibexecdir instead of bindir.

Browse Source 
Fixes: #434
This commit is contained in:
ZmnSCPxj 2018-01-03 11:44:42 +00:00 committed by Christian Decker
parent e717963210
commit 72841056f5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -337,23 +337,18 @@ POST_UNINSTALL = :
installdirs: installdirs:
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(MKDIR_P) $(DESTDIR)$(bindir) $(MKDIR_P) $(DESTDIR)$(bindir)
$(MKDIR_P) $(DESTDIR)$(pkglibexecdir)
$(MKDIR_P) $(DESTDIR)$(man1dir) $(MKDIR_P) $(DESTDIR)$(man1dir)
$(MKDIR_P) $(DESTDIR)$(man7dir) $(MKDIR_P) $(DESTDIR)$(man7dir)
$(MKDIR_P) $(DESTDIR)$(docdir) $(MKDIR_P) $(DESTDIR)$(docdir)
# Programs to install in bindir. # Programs to install in bindir and pkglibexecdir.
# FIXME: Note that subdaemons should properly be put in libexecdir,
# but current lightningd expects them to be in the same
# directory as itself.
# This could be a problem later, if lightningd changes its
# search path for subdaemons; it might pick up older versions
# of the subdaemons, if a newer version is installed, without
# uninstalling the previous version.
# TODO: $(EXEEXT) support for Windows? Needs more coding for # TODO: $(EXEEXT) support for Windows? Needs more coding for
# the individual Makefiles, however. # the individual Makefiles, however.
BIN_PROGRAMS = \ BIN_PROGRAMS = \
cli/lightning-cli \ cli/lightning-cli \
lightningd/lightningd \ lightningd/lightningd
PKGLIBEXEC_PROGRAMS = \
lightningd/lightning_channeld \ lightningd/lightning_channeld \
lightningd/lightning_closingd \ lightningd/lightning_closingd \
lightningd/lightning_gossipd \ lightningd/lightning_gossipd \
@ -361,9 +356,10 @@ BIN_PROGRAMS = \
lightningd/lightning_onchaind \ lightningd/lightning_onchaind \
lightningd/lightning_openingd lightningd/lightning_openingd
install-program: installdirs $(BIN_PROGRAMS) install-program: installdirs $(BIN_PROGRAMS) $(PKGLIBEXEC_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(INSTALL_PROGRAM) $(BIN_PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(BIN_PROGRAMS) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(PKGLIBEXEC_PROGRAMS) $(DESTDIR)$(pkglibexecdir)
MAN1PAGES = $(filter %.1,$(MANPAGES)) MAN1PAGES = $(filter %.1,$(MANPAGES))
MAN7PAGES = $(filter %.7,$(MANPAGES)) MAN7PAGES = $(filter %.7,$(MANPAGES))
@ -383,6 +379,10 @@ uninstall:
echo rm -f $(DESTDIR)$(bindir)/`basename $$f`; \ echo rm -f $(DESTDIR)$(bindir)/`basename $$f`; \
rm -f $(DESTDIR)$(bindir)/`basename $$f`; \ rm -f $(DESTDIR)$(bindir)/`basename $$f`; \
done done
@for f in $(PKGLIBEXEC_PROGRAMS); do \
echo rm -f $(DESTDIR)$(pkglibexecdir)/`basename $$f`; \
rm -f $(DESTDIR)$(pkglibexecdir)/`basename $$f`; \
done
@for f in $(MAN1PAGES); do \ @for f in $(MAN1PAGES); do \
echo rm -f $(DESTDIR)$(man1dir)/`basename $$f`; \ echo rm -f $(DESTDIR)$(man1dir)/`basename $$f`; \
rm -f $(DESTDIR)$(man1dir)/`basename $$f`; \ rm -f $(DESTDIR)$(man1dir)/`basename $$f`; \