From 20bd19a9ad1a2052c5616af70d4dd67657a19143 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 21 Sep 2023 18:18:27 +0900
Subject: [PATCH] Move YARP_BUILD_DIR to common.mk

It does not need to be an absolute path.
---
 common.mk            | 4 +++-
 template/Makefile.in | 1 -
 win32/Makefile.sub   | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index a2721bfc04..3fcbb52e50 100644
--- a/common.mk
+++ b/common.mk
@@ -83,7 +83,9 @@ ENC_MK        = enc.mk
 MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
 		RUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BOOTSTRAPRUBY)" $(mflags)
 
-YARP_FILES = yarp/api_node.$(OBJEXT) \
+YARP_BUILD_DIR = yarp
+
+YARP_FILES =    yarp/api_node.$(OBJEXT) \
 		yarp/api_pack.$(OBJEXT) \
 		yarp/diagnostic.$(OBJEXT) \
 		yarp/enc/yp_big5.$(OBJEXT) \
diff --git a/template/Makefile.in b/template/Makefile.in
index 6fdece8efe..a3b512b3a8 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -102,7 +102,6 @@ YJIT_LIBS=@YJIT_LIBS@
 YJIT_OBJ=@YJIT_OBJ@
 YJIT_LIBOBJ = $(YJIT_LIBS:.a=.@OBJEXT@)
 CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target
-YARP_BUILD_DIR=@abs_top_builddir@/yarp
 CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXE_LDFLAGS = $(LDFLAGS)
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index feb7bfd2b5..1791453893 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -514,8 +514,6 @@ VCSUP = rem
 !endif
 ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
-YARP_BUILD_DIR = $(MAKEDIR)/yarp
-
 MESSAGE_BEGIN = @(for %I in (
 MESSAGE_END = ) do @echo.%~I)
 ECHO_BEGIN = @echo.