The stdlib variable gets a trailing slash.

* txr.c (sysroot_init): Add slash to stdlib_path.
(sysroot_compat_fixup): Replace user-visible stdlib
variable with a path that doesn't have a slash,
if compatibility is 143 or lower.
(compat): Call sysroot_compat_fixup.

* lisplib.c (place_set_entries, ver_set_entries,
ifa_set_entries, txr_case_set_entries,
with_resources_set_entries, path_test_set_entries,
struct_set_entries, with_stream_set_entries, hash_set_entries,
except_set_entries, type_set_entries, yield_set_entries,
sock_set_entries, termios_set_entries): Remove slash from
format string since the directory includes it.

* txr.1: Added note under stdlib about the slash,
and also an entry COMPATIBILITY.

1 files changed, 9 insertions, 1 deletions

diff --git a/txr.c b/txr.c
index ef82c84a..56d67771 100644
--- a/txr.c
+++ b/txr.c
@@ -316,7 +316,7 @@ static void sysroot_init(void)
     sysroot_path = prog_dir;
   }
 
-  stdlib_path = sysroot(lit("share/txr/stdlib"));
+  stdlib_path = sysroot(lit("share/txr/stdlib/"));
 
   reg_varl(intern(lit("stdlib"), user_package), stdlib_path);
   reg_varl(intern(lit("*txr-version*"), user_package),
@@ -326,6 +326,13 @@ static void sysroot_init(void)
   reg_varl(intern(lit("txr-path"), user_package), prog_dir);
 }
 
+static void sysroot_compat_fixup(int compat_ver)
+{
+  if (compat_ver <= 143)
+    reg_varl(intern(lit("stdlib"), user_package),
+             sysroot(lit("share/txr/stdlib")));
+}
+
 static int license(void)
 {
   int retval = EXIT_SUCCESS;
@@ -411,6 +418,7 @@ static int compat(val optval)
     return 0;
   }
 
+  sysroot_compat_fixup(compat);
   opt_compat = compat;
   return 1;
 }