Skip to content

Commit ebbef62

Browse files
committedNov 28, 2023
8320769: Remove ill-adviced "make install" target
Reviewed-by: erikj, shade
1 parent 86bb804 commit ebbef62

File tree

4 files changed

+1
-104
lines changed

4 files changed

+1
-104
lines changed
 

‎make/Global.gmk

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@ help:
5252
$(info $(_) make docs # Create all docs)
5353
$(info $(_) make docs-jdk-api # Create just JDK javadocs)
5454
$(info $(_) make bootcycle-images # Build images twice, second time with newly built JDK)
55-
$(info $(_) make install # Install the generated images locally)
5655
$(info $(_) make check # Run basic testing (currently tier1))
5756
$(info $(_) make test-<test> # Run test, e.g. test-tier1)
5857
$(info $(_) make test TEST=<t> # Run test(s) given by TEST specification)

‎make/Install.gmk

-43
This file was deleted.

‎make/Main.gmk

-8
Original file line numberDiff line numberDiff line change
@@ -866,14 +866,6 @@ ifeq ($(JCOV_ENABLED), true)
866866
))
867867
endif
868868

869-
################################################################################
870-
# Install targets
871-
872-
$(eval $(call SetupTarget, install, \
873-
MAKEFILE := Install, \
874-
DEPS := product-images, \
875-
))
876-
877869
################################################################################
878870
#
879871
# Dependency declarations between targets.

‎make/autoconf/spec.gmk.in

-51
Original file line numberDiff line numberDiff line change
@@ -823,57 +823,6 @@ UCRT_DLL_DIR := @UCRT_DLL_DIR@
823823
ENABLE_PANDOC := @ENABLE_PANDOC@
824824
PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
825825

826-
####################################################
827-
#
828-
# INSTALLATION
829-
#
830-
831-
# Common prefix for all installed files. Defaults to /usr/local,
832-
# but /opt/myjdk is another common version.
833-
INSTALL_PREFIX = @prefix@
834-
835-
# Directories containing architecture-dependent files should be relative to exec_prefix
836-
INSTALL_EXECPREFIX = @exec_prefix@
837-
838-
# java,javac,javap etc are installed here.
839-
INSTALL_BINDIR = @bindir@
840-
841-
# Read only architecture-independent data
842-
INSTALL_DATADIR = @datadir@
843-
844-
# Root of above.
845-
INSTALL_DATAROOTDIR = @datarootdir@
846-
847-
# Doc files, other than info and man.
848-
INSTALL_DOCDIR = @docdir@
849-
850-
# Html documentation
851-
INSTALL_HTMLDIR = @htmldir@
852-
853-
# Installing C header files, JNI headers for example.
854-
INSTALL_INCLUDEDIR = @includedir@
855-
856-
# Installing library files....
857-
INSTALL_INCLUDEDIR = @libdir@
858-
859-
# Executables that other programs run.
860-
INSTALL_LIBEXECDIR = @libexecdir@
861-
862-
# Locale-dependent but architecture-independent data, such as message catalogs.
863-
INSTALL_LOCALEDIR = @localedir@
864-
865-
# Modifiable single-machine data
866-
INSTALL_LOCALSTATEDIR = @localstatedir@
867-
868-
# Man pages
869-
INSTALL_MANDIR = @mandir@
870-
871-
# Modifiable architecture-independent data.
872-
INSTALL_SHAREDSTATEDIR = @sharedstatedir@
873-
874-
# Read-only single-machine data
875-
INSTALL_SYSCONFDIR = @sysconfdir@
876-
877826
####################################################
878827
#
879828
# Libraries

0 commit comments

Comments
 (0)
Please sign in to comment.