From e1478977c186762c0b8e69c19b68379c8b6eb83d Mon Sep 17 00:00:00 2001 From: Andrey Miroshnikov Date: Mon, 25 Jul 2022 15:10:09 +0000 Subject: [PATCH] Fix path, change Java and Saxon to default --- build.sh | 2 +- distrib/share/etc/AVT_Linux.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 9c7916b..0d4ae0a 100755 --- 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 60b0728..14d2efa 100644 --- 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 -- 2.30.2