summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MULTI4
-rw-r--r--Makefile.in16
2 files changed, 8 insertions, 12 deletions
diff --git a/MULTI b/MULTI
index a50e30e..606f815 100644
--- a/MULTI
+++ b/MULTI
@@ -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.