better test for current file layout

fixes issue #54
jakobkroeker · Aug 25, 2014 · 04d14f8 · 04d14f8
1 parent 2e521cc
commit 04d14f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/M2/Macaulay2/d/startup.m2.in b/M2/Macaulay2/d/startup.m2.in
@@ -306,8 +306,8 @@ initcurrentlayout := () -> (
      issuffix := (s,t) -> t =!= null and s === substring(t,-#s);
      bindir := dir exe | "/";
      currentLayout = (
-	  if issuffix(Layout#2#"bin",bindir) then Layout#2 else
-	  if issuffix(Layout#1#"bin",bindir) then Layout#1
+	  if issuffix(Layout#2#"bin","/"|bindir) then Layout#2 else
+	  if issuffix(Layout#1#"bin","/"|bindir) then Layout#1
 	  );
      prefixDirectory = if currentLayout =!= null then substring(bindir,0,#bindir-#currentLayout#"bin");
      if notify then stderr << "--prefixDirectory = " << prefixDirectory << endl;