Skip to content

Commit 6efa88d

Browse files
fandreuzshipilev
authored andcommitted
8320769: Remove ill-adviced "make install" target
Reviewed-by: phh Backport-of: ebbef629c74dc670adc74a3905a6acf17dbd7200
1 parent 895101c commit 6efa88d

File tree

4 files changed

+1
-104
lines changed

4 files changed

+1
-104
lines changed

make/Global.gmk

Lines changed: 1 addition & 2 deletions
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

Lines changed: 0 additions & 43 deletions
This file was deleted.

make/Main.gmk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -844,14 +844,6 @@ ifeq ($(JCOV_ENABLED), true)
844844
))
845845
endif
846846

847-
################################################################################
848-
# Install targets
849-
850-
$(eval $(call SetupTarget, install, \
851-
MAKEFILE := Install, \
852-
DEPS := product-images, \
853-
))
854-
855847
################################################################################
856848
#
857849
# Dependency declarations between targets.

make/autoconf/spec.gmk.in

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -817,57 +817,6 @@ UCRT_DLL_DIR:=@UCRT_DLL_DIR@
817817
ENABLE_PANDOC:=@ENABLE_PANDOC@
818818
PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
819819

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

0 commit comments

Comments
 (0)