make/autoconf/spec.gmk.in

*** 538,548 ****
  # The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
  # for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
  # versions of the variables directly.
  JAVA_CMD:=@JAVA@
  JAVAC_CMD:=@JAVAC@
- JAVAH_CMD:=@JAVAH@
  JAVADOC_CMD:=@JAVADOC@
  JAR_CMD:=@JAR@
  JLINK_CMD := @JLINK@
  JMOD_CMD := @JMOD@
  JARSIGNER_CMD:=@JARSIGNER@
--- 538,547 ----
*** 551,561 ****
  # it possible to override only the *_CMD variables.
  JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
  JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
  JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
  JAVAC=@FIXPATH@ $(JAVAC_CMD)
- JAVAH=@FIXPATH@ $(JAVAH_CMD)
  JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
  JAR=@FIXPATH@ $(JAR_CMD)
  JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL)
  JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
  JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
--- 550,559 ----
*** 715,725 ****
  INSTALL_PREFIX=@prefix@
  
  # Directories containing architecture-dependent files should be relative to exec_prefix
  INSTALL_EXECPREFIX=@exec_prefix@
  
! # java,javac,javah,javap etc are installed here.
  INSTALL_BINDIR=@bindir@
  
  # Read only architecture-independent data
  INSTALL_DATADIR=@datadir@
  
--- 713,723 ----
  INSTALL_PREFIX=@prefix@
  
  # Directories containing architecture-dependent files should be relative to exec_prefix
  INSTALL_EXECPREFIX=@exec_prefix@
  
! # java,javac,javap etc are installed here.
  INSTALL_BINDIR=@bindir@
  
  # Read only architecture-independent data
  INSTALL_DATADIR=@datadir@