# HG changeset patch
# User wenzelm
# Date 1341488146 -7200
# Node ID cd0a411b7fc1e9b9a699765a652e6edc9f5de127
# Parent  dcfe2c92fc7cfb1dd31544297f04ff8e38ea6a08# Parent  6615f7ce670b630d47cc2f8c23da18b76136246c
merged

diff -r dcfe2c92fc7c -r cd0a411b7fc1 Admin/isatest/settings/at-poly-test
--- a/Admin/isatest/settings/at-poly-test	Thu Jul 05 13:24:09 2012 +0200
+++ b/Admin/isatest/settings/at-poly-test	Thu Jul 05 13:35:46 2012 +0200
@@ -24,8 +24,8 @@
 
 ISABELLE_USEDIR_OPTIONS="-i true -d pdf -v true -t true"
 
-ISABELLE_GHC="/home/isabelle/contrib_devel/ghc/x86-linux/ghc"
-ISABELLE_OCAML="/home/isabelle/contrib_devel/ocaml/x86-linux/ocaml"
+ISABELLE_GHC="/usr/bin/ghc"
+ISABELLE_OCAML="/usr/bin/ocaml"
 ISABELLE_SWIPL="/home/isabelle/contrib_devel/swipl/bin/swipl"
 
 init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r dcfe2c92fc7c -r cd0a411b7fc1 etc/settings
--- a/etc/settings	Thu Jul 05 13:24:09 2012 +0200
+++ b/etc/settings	Thu Jul 05 13:35:46 2012 +0200
@@ -220,6 +220,6 @@
 #GLPK_PATH=glpsol
 
 # Misc programming languages
-#ISABELLE_GHC="/usr/local/ghc/$ISABELLE_PLATFORM/ghc"
-#ISABELLE_OCAML="/usr/local/ocaml/$ISABELLE_PLATFORM/ocaml"
-#ISABELLE_SWIPL="/usr/local/swipl/$ISABELLE_PLATFORM/swipl"
+#ISABELLE_GHC="/usr/bin/ghc"
+#ISABELLE_OCAML="/usr/bin/ocaml"
+#ISABELLE_SWIPL="/usr/bin/swipl"