OpenSSH 3.7 testing (Re: 3.6p1 bug on SCO OpenServer)

[Darren Tucker]

Brian Poole wrote:
> Mmmkay, error has changed at least.. this problem turns out to be in
> spacing around the +=.. From the man page of Solaris make:
> 
>      +=    When used in place of `=', appends a string to a macro
>            definition  (must be surrounded by white space, unlike
>            `=').
> 
> Must be surrounded by white space.. adding that in (and a change
> so we can see what exactly its cleaning) gives us:

[snip]

>  USER!=         id -un
> -CLEANFILES+=   authorized_keys_${USER} known_hosts pidfile \
> +CLEANFILES   += authorized_keys_${USER} known_hosts pidfile \

As it turns out, that extra space breaks AIX's native make.  Sigh.  It
works without it, but with it you get:

"Makefile", line 6: make: 1254-055 Dependency line needs colon or double
colon operator.
"Makefile", line 43: make: 1254-055 Dependency line needs colon or double
colon operator.
make: 1254-058 Fatal errors encountered -- cannot continue.
make: 1254-004 The error code from the last command is 2.

Anyone object to tossing out the "+=" like so?

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.
-------------- next part --------------
Index: regress/Makefile
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/regress/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- regress/Makefile	14 Sep 2003 01:40:36 -0000	1.9
+++ regress/Makefile	14 Sep 2003 03:10:48 -0000
@@ -3,7 +3,6 @@
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
 
-CLEANFILES +=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
 clean:
 	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
 distclean:	clean
@@ -36,7 +35,8 @@ LTESTS= 	connect \
 		forwarding
 
 USER!=		id -un
-CLEANFILES +=	authorized_keys_${USER} known_hosts pidfile \
+CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+		authorized_keys_${USER} known_hosts pidfile \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \