From cbe8448f28895b887157c1f23a0cf70070449509 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Nov 2024 10:15:02 +0000
Subject: [PATCH] 8268895: Do not filter out man pages from build

Reviewed-by: dholmes, jwaters
---
 make/autoconf/jdk-options.m4           |  7 ++-----
 make/autoconf/spec.gmk.template        |  2 --
 make/common/modules/LauncherCommon.gmk | 13 +++++--------
 make/conf/jib-profiles.js              |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index fec0a93161b..c5c2290019b 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -638,14 +638,11 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS],
 
 ################################################################################
 #
-# Optionally disable man pages
+# Optionally disable man pages (deprecated)
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES],
 [
-  UTIL_ARG_ENABLE(NAME: manpages, DEFAULT: true, RESULT: BUILD_MANPAGES,
-      DESC: [enable copying of static man pages],
-      CHECKING_MSG: [if static man pages should be copied])
-  AC_SUBST(BUILD_MANPAGES)
+  UTIL_DEPRECATED_ARG_ENABLE(manpages)
 ])
 
 ################################################################################
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 62afd6577ab..231355043d5 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -367,8 +367,6 @@ ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
 
 EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
 
-BUILD_MANPAGES := @BUILD_MANPAGES@
-
 BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
 BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@
 
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index 7c2cef58835..aa721a683d7 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -228,14 +228,11 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
     endif
   else
     # No markdown man pages present
-    ifeq ($(BUILD_MANPAGES), true)
-      # BUILD_MANPAGES is a mis-nomer. It really means "copy the pre-generated man pages".
-      $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \
-          DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \
-          FILES := $(MAN_FILES_TROFF), \
-      ))
+    $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \
+        DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \
+        FILES := $(MAN_FILES_TROFF), \
+    ))
 
-      TARGETS += $(COPY_MAN_PAGES)
-    endif
+    TARGETS += $(COPY_MAN_PAGES)
   endif
 endif
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 0785d340f48..a28d85c146f 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -252,7 +252,6 @@ var getJibProfilesCommon = function (input, data) {
         default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
         configure_args: concat(
             "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
-            "--disable-manpages",
             "--disable-jvm-feature-shenandoahgc",
             versionArgs(input, common))
     };