equal
deleted
inserted
replaced
123 INTLTOOL_EXTRACT = /usr/bin/intltool-extract |
123 INTLTOOL_EXTRACT = /usr/bin/intltool-extract |
124 INTLTOOL_UPDATE = /usr/bin/intltool-update |
124 INTLTOOL_UPDATE = /usr/bin/intltool-update |
125 INTLTOOL_MERGE = /usr/bin/intltool-merge |
125 INTLTOOL_MERGE = /usr/bin/intltool-merge |
126 |
126 |
127 # Set here explicitly to avoid compiling with newer class version |
127 # Set here explicitly to avoid compiling with newer class version |
128 JDK_HOME = /usr/jdk/instances/jdk1.7.0 |
128 JDK_HOME = /usr/jdk/instances/jdk1.8.0 |
129 JAVA_HOME = $(JDK_HOME) |
129 JAVA_HOME = $(JDK_HOME) |
130 |
130 |
131 JAVAC = $(JDK_HOME)/bin/javac |
131 JAVAC = $(JDK_HOME)/bin/javac |
132 JAR = $(JDK_HOME)/bin/jar |
132 JAR = $(JDK_HOME)/bin/jar |
133 JAVADOC = $(JDK_HOME)/bin/javadoc |
133 JAVADOC = $(JDK_HOME)/bin/javadoc |