Please test -current

[Mark D. Baushke]

Hi Corinna,

Your patch causes problems when doing a 

  make -f Makefile.in distprep

which unpacks the Sshbin.uu file into Ssh.bin for use in the distribution.
If you have $(srcdir) in the 'Ssh.bin: Ssh.bin.uu' dependency, then the
distprep will fail as there will be no @srcdir@/Ssh.bin.uu file to run
through uudecode

The Makefile.in (version 1.3) works fine to generate the distribution and
that distribution may be used when bindir != srcdir because the Ssh.bin
file will be in the srcdir you do need the 'install: $(srcdir)/Ssh.bin'
dependency.

	-- Mark

> Date: Mon, 12 Nov 2001 11:02:52 +0100
> From: Corinna Vinschen <vinschen at redhat.com>
> 
> On Mon, Nov 12, 2001 at 10:42:23AM +0100, Corinna Vinschen wrote:
> > On Mon, Nov 12, 2001 at 12:30:42PM +1100, Damien Miller wrote:
> > > Could people please test -current? We will be making a release fairly 
> > > soon.
> > 
> > Somebody seem to have inadvertently removed the patch to allow
> > to install scard/Ssh.bin when builddir != srcdir.  Or was it never
> > checked in?
> > 
> > Corinna
> 
> Sorry, the previous patch didn't change the dependency.
> Corrected patch follows:
> 
> Index: scard/Makefile.in
> ===================================================================
> RCS file: /cvs/openssh_cvs/scard/Makefile.in,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile.in
> --- scard/Makefile.in	2001/10/27 00:33:19	1.3
> +++ scard/Makefile.in	2001/11/12 09:54:12
> @@ -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
> @@ -22,6 +22,6 @@ distprep: Ssh.bin
>  distclean: clean
>  	rm -f Makefile *~
>  
> -install: $(srcdir)/Ssh.bin
> +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 Vinschen
> Cygwin Developer
> Red Hat, Inc.
> mailto:vinschen at redhat.com
>