merge revision(s) 7b11247b4dc6b04c3ba3876009145ce0dbf78662:

	Fix potential target type confliction [ci skip]

	---
	 common.mk | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

2 files changed, 2 insertions, 2 deletions

diff --git a/common.mk b/common.mk
index 258643bc14..4ca99b272e 100644
--- a/common.mk
+++ b/common.mk
@@ -843,7 +843,7 @@ extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(HAVE_BASERUBY:no=)$(RBCONFIG): $(PREP)
+$(HAVE_BASERUBY:no=)$(RBCONFIG)$(HAVE_BASERUBY:no=): $(PREP)
 $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) -n \
 	-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
diff --git a/version.h b/version.h
index 42362ca5c6..f905ce416e 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 103
+#define RUBY_PATCHLEVEL 104
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10