diff -up Macaulay2-1.4-r12617/Macaulay2/packages/Normaliz.m2.fedora_normaliz Macaulay2-1.4-r12617/Macaulay2/packages/Normaliz.m2
--- Macaulay2-1.4-r12617/Macaulay2/packages/Normaliz.m2.fedora_normaliz 2010-09-09 13:52:08.000000000 -0500
+++ Macaulay2-1.4-r12617/Macaulay2/packages/Normaliz.m2 2011-05-27 07:31:17.365407323 -0500
@@ -99,7 +99,7 @@ nmzFilename="";
nmzNumberThreads=1;
nmzUserCalled=true; -- wether the user calls a method
nmzFile="";
-nmzVersion=""; -- norm64 or normbig
+nmzVersion=""; -- normaliz, norm64, or normbig
nmzExecVersion=""; -- needs to be at last "2.5"
nmzGen=true; -- indicates whether ".gen" is generated
-- component 1 is name of option
@@ -146,17 +146,17 @@ setNmzExec=()->
(
if(nmzVersion!="")
then(
- if(nmzVersion!="norm64" and nmzVersion !="normbig") then <<error("nmzVersion must be one of the following: norm64, normbig")
+ if(nmzVersion!="normaliz" and nmzVersion!="norm64" and nmzVersion !="normbig") then <<error("nmzVersion must be one of the following: normaliz, norm64, normbig")
else(
nmzExec:=nmzVersion;
);
)
else
(
- nmzExec="norm64";
+ nmzExec="normaliz";
);
-- return nmzExec;
- return prefixDirectory | currentLayout#"programs" | nmzExec;
+ return "/usr/bin/" | nmzExec;
);