# HG changeset patch
# User David Kirkby <david.kirkby@onetel.net>
# Date 1263265328 0
# Node ID 86104d7de2d480d91c02700ecc143b807fbf5fe4
# Parent  0d307507e552587ef770571329e711f50ea334b1
Change all occurances of variables for very common files (mv, ln,
touch, mkdir, chmod and rm) to just the names. i.e. $CHMOD -> chmod.

Otherwise, they will break with an updated sage-env, which does not define
TOUCH, MKDIR etc.

diff -r 0d307507e552 -r 86104d7de2d4 SPKG.txt
--- a/SPKG.txt	Wed Nov 18 17:05:30 2009 +0000
+++ b/SPKG.txt	Tue Jan 12 03:02:08 2010 +0000
@@ -10,6 +10,10 @@
 == Releases ==
 
 
+=== singular-3-1-0-4-20090818.p3 (David Kirkby, 12th January 2010) ===
+ * Change all occurances of variables for very common files (mv, ln, 
+   touch, mkdir, chmod and rm) to just the names. i.e. $CHMOD -> chmod. 
+
 === singular-3-1-0-4-20090818.p2 (Martin Albrecht, November 18th, 2009) ===
  * installing lists.h from Singular (#7194)
 
diff -r 0d307507e552 -r 86104d7de2d4 spkg-install
--- a/spkg-install	Wed Nov 18 17:05:30 2009 +0000
+++ b/spkg-install	Tue Jan 12 03:02:08 2010 +0000
@@ -162,15 +162,15 @@
     # For some reason the permissions are set for the user to read only
     # for singular's library.  This causes problems on multi-user system
     # install.
-    $CHMOD a+r Singular/LIB/*
+    chmod a+r Singular/LIB/*
 
     cd "$SAGE_LOCAL"
     if [ -d LIB -a ! -h LIB ]; then
         echo "skipping since filenames not case sensitive."
     else
-        $RM -f LIB
+        rm -f LIB
         if [ "$UNAME" != "Darwin" ]; then
-            $LN -sf lib LIB
+            ln -sf lib LIB
         fi
     fi
 
@@ -191,10 +191,10 @@
     # The Singular build annoyingly puts an absolute link to the Singular 
     # script in $SAGE_LOCAL/bin/.  So we delete it and make it relative.
     cd $SAGE_LOCAL/bin
-    $RM -f Singular singular
+    rm -f Singular singular
 
     if [ -f Singular-1-0-2 ]; then
-        $RM -f Singular-1-0-2   # remove previous version of Singular.
+        rm -f Singular-1-0-2   # remove previous version of Singular.
     fi
 
     # The singular executable is called somewhat randomly depending
@@ -211,12 +211,12 @@
    
     echo "#!/bin/sh" > Singular
     echo "`/bin/ls Singular-* | tail -1` \$*" >> Singular
-    $CHMOD +x Singular
+    chmod +x Singular
 
     # Lower case version is convenient.
     $CP -f Singular singular
 
-    $LN -sf Singular sage_singular
+    ln -sf Singular sage_singular
 }
 
 build_libsingular()