[patch] simplify install links

Matt Johnston matt at ucc.asn.au
Wed Dec 11 21:55:54 WST 2013


On Sun, Dec 08, 2013 at 08:26:43PM -0500, Mike Frysinger wrote:
> there's no need to do `rm; ln` when `ln -f` will do the same thing

It's not always the same, I dislike "ln -f". For example:

ln -s /tmp foo
ln -sf /etc/hosts foo
cat foo

> also, for softlinks in the bindir, just use relative ones rather than absolute

I'm not convinced this is worth doing - the "dropbear"
binary will need an absolute path, so they may as well be
consistent.

I've applied the other patches, thanks!

Cheers,
Matt

> --- a/Makefile.in	Tue Dec 03 22:00:38 2013 +0800
> +++ b/Makefile.in	Sun Dec 08 20:25:54 2013 -0500
> @@ -126,15 +126,13 @@ install: $(addprefix inst_, $(TARGETS))
>  
>  insmultidropbear: dropbearmulti
>  	$(INSTALL) -d $(DESTDIR)$(sbindir)
> -	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
> -	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
> +	-ln -sf $(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) 
> +	-ln -sf dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT)
>  	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
>  	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
>  




More information about the Dropbear mailing list