diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-10-09 22:24:39 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-10-09 22:24:39 +0800 |
| commit | 4da048fb172f03d145af20d7c74267c5d37c8df7 (patch) | |
| tree | 6ce6cb58cde2d8257bdf9c15a703a66ae5929b62 | |
| parent | 4069876c94d8b402d07fb4b2b7e540b8cc2eaa3b (diff) | |
| download | dropbear-4da048fb172f03d145af20d7c74267c5d37c8df7.tar.gz | |
- Fix "inst_scp" target since there isn't a manpage
- Fix "make install MULTI=1"
| -rw-r--r-- | MULTI | 4 | ||||
| -rw-r--r-- | Makefile.in | 16 |
2 files changed, 8 insertions, 12 deletions
@@ -20,7 +20,3 @@ etc then execute as normal: ./dropbear <options here> - -"make install" doesn't currently work for multi-binary configuration, though -in most situations where it is being used, the target and build systems will -differ. diff --git a/Makefile.in b/Makefile.in index 5d65586..bce11c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,34 +122,34 @@ strip: $(TARGETS) install: $(addprefix inst_, $(TARGETS)) -installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS)) - -insdbmulti: dropbearmulti - $(INSTALL) -d $(DESTDIR)$(bindir) - $(INSTALL) dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir) - insmultidropbear: dropbearmulti $(INSTALL) -d $(DESTDIR)$(sbindir) -rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 insmulti%: dropbearmulti $(INSTALL) -d $(DESTDIR)$(bindir) -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1 # dropbear should go in sbin, so it needs a seperate rule inst_dropbear: dropbear $(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir) $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 + $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 inst_%: $* $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1 + if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi + +inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) # for some reason the rule further down doesn't like $($@objs) as a prereq. |