diff -crN '--exclude=.git' pljava-1_5_2_org/Makefile pljava-1_5_2/Makefile *** pljava-1_5_2_org/Makefile 2022-03-05 22:28:27.163158647 +0800 --- pljava-1_5_2/Makefile 2022-03-05 22:30:18.985112510 +0800 *************** *** 18,24 **** PLJAVA_JAVA_ROOT=$(top_builddir)/$(PLJAVA_JAVA) PLJAVA_SO_ROOT =$(top_builddir)/$(PLJAVA_SO) ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/huaweijdk8/${ARCH}/jdk JRE_HOME = $(JAVA_HOME)/jre .PHONY: all pljava_api pljava_java pljava_javah pljava_so checkmppdb install_pljava uninstall_pljava clean distclean pljava_clean pljava --- 18,24 ---- PLJAVA_JAVA_ROOT=$(top_builddir)/$(PLJAVA_JAVA) PLJAVA_SO_ROOT =$(top_builddir)/$(PLJAVA_SO) ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/openjdk8/${ARCH}/jdk JRE_HOME = $(JAVA_HOME)/jre .PHONY: all pljava_api pljava_java pljava_javah pljava_so checkmppdb install_pljava uninstall_pljava clean distclean pljava_clean pljava diff -crN '--exclude=.git' pljava-1_5_2_org/pljava/javah.mk pljava-1_5_2/pljava/javah.mk *** pljava-1_5_2_org/pljava/javah.mk 2022-03-05 22:28:27.163158647 +0800 --- pljava-1_5_2/pljava/javah.mk 2022-03-05 22:29:38.704767477 +0800 *************** *** 15,21 **** top_builddir := $(shell pwd)/.. #include $(top_builddir)/../Makefile.global ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/huaweijdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre JAVAP = $(JAVA_HOME)/bin/javap --- 15,21 ---- top_builddir := $(shell pwd)/.. #include $(top_builddir)/../Makefile.global ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/openjdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre JAVAP = $(JAVA_HOME)/bin/javap diff -crN '--exclude=.git' pljava-1_5_2_org/pljava/Makefile pljava-1_5_2/pljava/Makefile *** pljava-1_5_2_org/pljava/Makefile 2022-03-05 22:28:27.163158647 +0800 --- pljava-1_5_2/pljava/Makefile 2022-03-05 22:29:52.219883244 +0800 *************** *** 14,20 **** top_builddir := $(shell pwd)/.. ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/huaweijdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre #include $(top_builddir)/../Makefile.global --- 14,20 ---- top_builddir := $(shell pwd)/.. ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/openjdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre #include $(top_builddir)/../Makefile.global diff -crN '--exclude=.git' pljava-1_5_2_org/pljava-api/Makefile pljava-1_5_2/pljava-api/Makefile *** pljava-1_5_2_org/pljava-api/Makefile 2022-03-05 22:28:27.177158766 +0800 --- pljava-1_5_2/pljava-api/Makefile 2022-03-05 22:29:23.060634295 +0800 *************** *** 13,19 **** OBJS = $(call mkobjs, $(SRCS)) top_builddir := $(shell pwd)/.. ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/huaweijdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre #include $(top_builddir)/../Makefile.global PRONE_SQLGEN = DDRWriter.java --- 13,19 ---- OBJS = $(call mkobjs, $(SRCS)) top_builddir := $(shell pwd)/.. ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../platform/openjdk8/${ARCH}/jdk JRE_HOME := $(JAVA_HOME)/jre #include $(top_builddir)/../Makefile.global PRONE_SQLGEN = DDRWriter.java diff -crN '--exclude=.git' pljava-1_5_2_org/pljava-so/Makefile pljava-1_5_2/pljava-so/Makefile *** pljava-1_5_2_org/pljava-so/Makefile 2022-03-05 22:28:27.192158894 +0800 --- pljava-1_5_2/pljava-so/Makefile 2022-03-05 22:30:05.397996125 +0800 *************** *** 13,19 **** include ../kernal/src/Makefile.global #include ../../Makefile.global ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../../platform/huaweijdk8/${ARCH}/jdk JRE_HOME = $(JAVA_HOME)/jre ifneq "$(MAKECMDGOALS)" "clean" --- 13,19 ---- include ../kernal/src/Makefile.global #include ../../Makefile.global ARCH = $(shell uname -m) ! JAVA_HOME = $(top_builddir)/../../../../platform/openjdk8/${ARCH}/jdk JRE_HOME = $(JAVA_HOME)/jre ifneq "$(MAKECMDGOALS)" "clean"