diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-02-26 03:27:45 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-02-26 03:27:45 +0000 |
commit | 5596cb12da2d6e0f447ae5b05d7ef192d609d22e (patch) | |
tree | ea024b5d8940394d6e2cd0876bb6f6fef6d6678c | |
parent | 89a2d8582f3314fec69d61b62bb715b93f9fe979 (diff) |
Merge from the Ericsson repository
| revision 1.5
| date: 1999/02/25 15:10:09; author: niklas; state: Exp; lines: +2 -2
| Whoops
| ----------------------------
| revision 1.4
| date: 1999/02/25 15:07:34; author: niklas; state: Exp; lines: +6 -2
| Mesing with the new sysdep paths
| ----------------------------
-rw-r--r-- | sbin/isakmpd/regress/exchange/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sbin/isakmpd/regress/exchange/Makefile b/sbin/isakmpd/regress/exchange/Makefile index 8b1f3c305e0..28e08bdd6b6 100644 --- a/sbin/isakmpd/regress/exchange/Makefile +++ b/sbin/isakmpd/regress/exchange/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.3 1998/12/21 01:02:30 niklas Exp $ -# $EOM: Makefile,v 1.3 1998/08/03 21:05:56 niklas Exp $ +# $OpenBSD: Makefile,v 1.4 1999/02/26 03:27:44 niklas Exp $ +# $EOM: Makefile,v 1.5 1999/02/25 15:10:09 niklas Exp $ # # Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -34,7 +34,11 @@ # This code was written under funding by Ericsson Radio Systems. # -TOPOBJ!= cd ${.CURDIR}/../..; printf "all:\n\t@pwd\n" |${MAKE} -f- +TOPSRC= ${.CURDIR}/../.. +TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f- +OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile +.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ} +CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall RUN= ISAKMPD=${TOPOBJ}/isakmpd ${.CURDIR}/run.sh TESTS= def |