summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-14 13:16:55 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-14 13:16:55 +1000
commit7b6cb5c5ef9ddd12e7cb695357209f1c08a57fc5 (patch)
treecace42f6e86fc796342d19e62340173f3385b505
parentb12d16fd003a62c564290f7b6ef44d68934823e3 (diff)
- (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace
with vanilla "=". Hopefully everybody's "make" will be happy with that.
-rw-r--r--ChangeLog4
-rw-r--r--regress/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b32f7b41..3f1a4cfec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing 2 - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing
3 the regression tests from running with Solaris' make. Patch from Brian 3 the regression tests from running with Solaris' make. Patch from Brian
4 Poole (raj at cerias.purdue.edu). 4 Poole (raj at cerias.purdue.edu).
5 - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace
6 with vanilla "=".
5 7
620030913 820030913
7 - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for 9 - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
@@ -1091,4 +1093,4 @@
1091 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1093 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1092 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1094 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1093 1095
1094$Id: ChangeLog,v 1.2990 2003/09/14 01:40:35 dtucker Exp $ 1096$Id: ChangeLog,v 1.2991 2003/09/14 03:16:55 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index c08201632..623be8d82 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -3,7 +3,6 @@
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
5 5
6CLEANFILES += t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
7clean: 6clean:
8 for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done 7 for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
9distclean: clean 8distclean: clean
@@ -36,7 +35,8 @@ LTESTS= connect \
36 forwarding 35 forwarding
37 36
38USER!= id -un 37USER!= id -un
39CLEANFILES += authorized_keys_${USER} known_hosts pidfile \ 38CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
39 authorized_keys_${USER} known_hosts pidfile \
40 ssh_config ssh_proxy sshd_config sshd_proxy \ 40 ssh_config ssh_proxy sshd_config sshd_proxy \
41 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ 41 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
42 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ 42 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \