Fix path, change Java and Saxon to default

diff --git a/build.sh b/build.sh
index 9c7916b4eeeffce59e1d7ae9187f06a2d0ebb0b6..0d4ae0a7de0cf54561d879806c85da8dcfe5485b 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -70,5 +70,5 @@ done
 cp -r distrib/share/tcl ${installDir}/share/tasyag
 
 echo "AVERTEC_TOP=`pwd`/distrib/share" > "${installDir}/avt_env.sh"
-echo "PATH=`pwd`/distrib/bin:${AVERTEC_TOP}/tcl:${PATH}" >> "${installDir}/avt_env.sh"
+echo "PATH=`pwd`/distrib/bin"':${AVERTEC_TOP}/tcl:${PATH}' >> "${installDir}/avt_env.sh"
 echo 'export AVERTEC_TOP' >> "${installDir}/avt_env.sh"

diff --git a/distrib/share/etc/AVT_Linux.mk b/distrib/share/etc/AVT_Linux.mk
index 60b072841be9d00560114a43b3aa2e8c69b93e9b..14d2efaef8c9f1119e589b7ae049721756e89689 100644 (file)
--- a/distrib/share/etc/AVT_Linux.mk
+++ b/distrib/share/etc/AVT_Linux.mk
@@ -32,9 +32,9 @@ else
         SAXON     = saxonb-xslt -ext:on
        #SAXON     = CLASSPATH=/usr/share/java/saxonb.jar $(JAVA) net.sf.saxon.Transform
       else
-        JAVA_HOME = /usr/lib/jvm/java-1.6.0-openjdk
+        JAVA_HOME = /usr/lib/jvm/default-java
         JAVA      = $(JAVA_HOME)/bin/java
-        SAXON     = $(JAVA) -jar /usr/share/java/saxon9.jar
+        SAXON     = $(JAVA) -jar /usr/share/java/saxon.jar
       endif
     endif
   endif