equal
deleted
inserted
replaced
108 TOUCH = /usr/bin/touch |
108 TOUCH = /usr/bin/touch |
109 CTFMERGE = /opt/onbld/bin/$(ISA)/ctfmerge |
109 CTFMERGE = /opt/onbld/bin/$(ISA)/ctfmerge |
110 CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert |
110 CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert |
111 |
111 |
112 # Set here explicitly to avoid compiling with newer class version |
112 # Set here explicitly to avoid compiling with newer class version |
113 JAVAC = /usr/bin/javac |
113 JDK_HOME = /usr |
114 JAR = /usr/bin/jar |
114 JAVA_HOME = /usr |
115 JAVADOC = /usr/bin/javadoc |
115 |
116 JAVAH = /usr/bin/javah |
116 JAVAC = $(JDK_HOME)/bin/javac |
|
117 JAR = $(JDK_HOME)/bin/jar |
|
118 JAVADOC = $(JDK_HOME)/bin/javadoc |
|
119 JAVAH = $(JDK_HOME)/bin/javah |
|
120 |
|
121 JAVA = $(JAVA_HOME)/bin/java |
117 |
122 |
118 # Consumers must depend on java (or java/adr) |
123 # Consumers must depend on java (or java/adr) |
119 ADRLOC=$(SRC)/java/adr/adr.jar |
124 ADRLOC=$(SRC)/java/adr/adr.jar |
120 ADRGEN=java -classpath $(ADRLOC) org.opensolaris.os.adr.adrgen.ADRGen |
125 ADRGEN=$(JAVA) -classpath $(ADRLOC) org.opensolaris.os.adr.adrgen.ADRGen |
121 |
126 |
122 # Lint |
127 # Lint |
123 LINTFLAGS = -s -errtags=yes -errsecurity=core -errwarn=%all |
128 LINTFLAGS = -s -errtags=yes -errsecurity=core -errwarn=%all |
124 |
129 |
125 # Mapfiles |
130 # Mapfiles |