[PATCH]: scard/Makefile.in broken when srcdir != builddir [was Re: Please test snapshots for 3.0 release]

[Tim Rice]

On Sat, 13 Oct 2001, Corinna Vinschen wrote:

> On Fri, Oct 12, 2001 at 11:47:38AM +1000, Damien Miller wrote:
> > Could everyone please test the latest snapshots as we will be making a
> > new release soon.
> >
> > If you have any patches you would like us to consider, please resend
> > them to the list ASAP.
>
> scard/Makefile.in doesn't work correctly in srcdir != builddir
> build environments. The following patch fixes that:

It's been working fine here. And none of my builds are in srcdir.
But then, after I pull CVS i do a "make -f Makefile.in distprep"

I think the patch has merrit. If we dropped the distprep line
from scard/Makefile.in and don't include Ssh.bin in the tarballs
it should be fine.

Comments?

>
> Index: scard/Makefile.in
> ===================================================================
> RCS file: /cvs/openssh_cvs/scard/Makefile.in,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile.in
> --- scard/Makefile.in	2001/09/20 18:39:37	1.2
> +++ scard/Makefile.in	2001/10/13 08:52:00
> @@ -11,8 +11,8 @@ VPATH=@srcdir@
>
>  all:
>
> -Ssh.bin:  Ssh.bin.uu
> -	uudecode Ssh.bin.uu
> +Ssh.bin:  $(srcdir)/Ssh.bin.uu
> +	uudecode -o $@ $(srcdir)/Ssh.bin.uu
>
>  clean:
>  	rm -rf Ssh.bin
> @@ -24,4 +24,4 @@ distclean: clean
>
>  install: Ssh.bin
>  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
> -	$(INSTALL) -m 0644 $(srcdir)/Ssh.bin $(DESTDIR)$(datadir)/Ssh.bin
> +	$(INSTALL) -m 0644 Ssh.bin $(DESTDIR)$(datadir)/Ssh.bin
>
> Corinna
>

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net