Waldek,

Instead of changing INSTALL.aldor, I'd like to get your permission to 
add the following patch.

I've tested it with and without Internet. And I don't see where else it 
can go wrong.

I somehow don't like the 3 ifs so much, but I don't know how to make it 
shorter.

Ralf

woodpecker:~/SVK/fricas/src/aldor>svk diff Makefile.in
=== Makefile.in
==================================================================
--- Makefile.in (revision 2548)
+++ Makefile.in (local)
@@ -45,7 +45,7 @@
        -rm easylist.lsp
        -rm libaxiom.lst aldordepfiles domaindepfiles
        -rm -rf tmp init_ap gendeps ap ao al
-       -rm cliques*
+       -rm cliques* *.tmp


  ###################################################################
@@ -157,28 +157,40 @@
  CURL:[EMAIL PROTECTED]@
  WGET:[EMAIL PROTECTED]@
  ifdef SVN
-  SVNCAT=$(SVN) cat
+  CATURL=$(SVN) cat
  else
  ifdef CURL
-  SVNCAT:=$(CURL)
+  CATURL:=$(CURL)
  else
  ifdef WGET
-  SVNCAT:=$(WGET) -O -
+  CATURL:=$(WGET) -O -
  else
-  SVNCAT:=echo Get the file manually from
+  CATURL:=echo Get the file manually from
  endif
  endif
  endif

  axiom.as axextend.as axlit.as stub.as:
-       $(SVNCAT) $(ALDORBASICS)/$@ > $@
+       if $(CATURL) $(ALDORBASICS)/$@ > [EMAIL PROTECTED]; then \
+         mv [EMAIL PROTECTED] $@; \
+       else \
+         rm [EMAIL PROTECTED]; false; \
+       fi

  minimach.as:
-       $(SVNCAT) $(ALDORBASICS)/$@ | \
-       sed -e 's/^#.*//;s/Language;/AxiomLib;inline from AxiomLib;/' > $@
+       if $(CATURL) $(ALDORBASICS)/$@ > [EMAIL PROTECTED]; then \
+         sed -e 's/^#.*//;s/Language;/AxiomLib;inline from AxiomLib;/' [EMAIL 
PROTECTED] 
 > $@ && \
+         rm [EMAIL PROTECTED]; \
+       else \
+         rm [EMAIL PROTECTED]; false; \
+       fi

  lang.as:
-       $(SVNCAT) $(ALDORLANG)/$@ > $@
+       if $(CATURL) $(ALDORLANG)/$@ > [EMAIL PROTECTED]; then \
+         mv [EMAIL PROTECTED] $@; \
+       else \
+         rm [EMAIL PROTECTED]; false; \
+       fi

  subsetc.as: stub.as
        grep AxiomLib $< > $@

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"FriCAS - computer algebra system" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/fricas-devel?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to