From 445c0a588fcbeb133b571fa3f302925fd6aab6c4 Mon Sep 17 00:00:00 2001
From: anton <anton@cvs.openbsd.org>
Date: Sat, 10 Jul 2021 12:25:47 +0000
Subject: honor objdir

---
 regress/usr.bin/rcs/Makefile | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile
index b789b021c21..17c0f9b97b6 100644
--- a/regress/usr.bin/rcs/Makefile
+++ b/regress/usr.bin/rcs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.44 2020/07/06 15:24:11 tb Exp $
+#	$OpenBSD: Makefile,v 1.45 2021/07/10 12:25:46 anton Exp $
 
 # Regression tests by Niall O'Higgins <niallo@openbsd.org>.
 # ksh -> Makefile by Ray Lai <ray@cyth.net>.
@@ -250,33 +250,29 @@ test-merge-eflag: clean
 
 test-merge-noeol: clean
 	@echo "<<<<<<< file1\nline1=======\nline3\n>>>>>>> file3" \
-		> ${.CURDIR}/merge-noeol.out
+		> merge-noeol.out
 	@echo -n "line1" > file1
 	@echo "line2" > file2
 	@echo "line3" > file3
-	@${MERGE} -p -q file1 file2 file3 | \
-	    ${DIFF} ${.CURDIR}/merge-noeol.out -
+	@${MERGE} -p -q file1 file2 file3 | ${DIFF} merge-noeol.out -
 	@echo "<<<<<<< file1\nline1\n=======\nline3\n>>>>>>> file3" \
-		> ${.CURDIR}/merge-noeol.out
+		> merge-noeol.out
 	@echo "line1" > file1
 	@echo -n "line2" > file2
 	@echo "line3" > file3
-	@${MERGE} -p -q file1 file2 file3 | \
-	    ${DIFF} ${.CURDIR}/merge-noeol.out -
+	@${MERGE} -p -q file1 file2 file3 | ${DIFF} merge-noeol.out -
 	@echo "<<<<<<< file1\nline1\n=======\nline3>>>>>>> file3" \
-		> ${.CURDIR}/merge-noeol.out
+		> merge-noeol.out
 	@echo "line1" > file1
 	@echo "line2" > file2
 	@echo -n "line3" > file3
-	@${MERGE} -p -q file1 file2 file3 | \
-	    ${DIFF} ${.CURDIR}/merge-noeol.out -
+	@${MERGE} -p -q file1 file2 file3 | ${DIFF} merge-noeol.out -
 	@echo "<<<<<<< file1\nline1=======\nline3>>>>>>> file3" \
-		> ${.CURDIR}/merge-noeol.out
+		> merge-noeol.out
 	@echo -n "line1" > file1
 	@echo -n "line2" > file2
 	@echo -n "line3" > file3
-	@${MERGE} -p -q file1 file2 file3 | \
-	    ${DIFF} ${.CURDIR}/merge-noeol.out -
+	@${MERGE} -p -q file1 file2 file3 | ${DIFF} merge-noeol.out -
 
 test-rcsmerge:
 	@cp -f ${.CURDIR}/rev1 blah.c
@@ -625,9 +621,9 @@ test-ci-parse-keywords2: clean
 
 # Check for correct EOF handling in rcs parser
 test-co-parse-truncated: clean
-	@sh -c 'ulimit -d 5000 && ${CO} -q ${.CURDIR}/test-truncated > ${.CURDIR}/truncated.out 2>&1' || \
+	@sh -c 'ulimit -d 5000 && ${CO} -q ${.CURDIR}/test-truncated > truncated.out 2>&1' || \
 	    case "$$?" in 1) exit 0;; esac && exit 1
-	@grep -q 'co: could not parse admin data' ${.CURDIR}/truncated.out
+	@grep -q 'co: could not parse admin data' truncated.out
 
 test-ci-2files: clean
 	@touch foo bar
-- 
cgit v1.2.3