From b12d16fd003a62c564290f7b6ef44d68934823e3 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 14 Sep 2003 11:40:35 +1000 Subject: - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing the regression tests from running with Solaris' make. Patch from Brian Poole (raj at cerias.purdue.edu). Further info: Solaris' /usr/ccs/bin/make * requires a space before "+=" (but not "=") * does not like @for The bit that relies on a trailing "/" on $OBJ so "rm ${OBJ}$$F works in the current dir if OBJ isn't set is my fault. Nasty but it works. --- regress/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'regress/Makefile') diff --git a/regress/Makefile b/regress/Makefile index ce876d483..c08201632 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,13 +1,11 @@ # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ -OBJ ?= `pwd` - 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 +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 + for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done distclean: clean LTESTS= connect \ @@ -38,13 +36,13 @@ LTESTS= connect \ forwarding USER!= id -un -CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ +CLEANFILES += 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 \ ls.copy remote_pid -#LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp +#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp t1: ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv -- cgit v1.2.3