--- a/lisp/ilisp/Makefile	Mon Aug 13 08:46:35 2007 +0200
+++ b/lisp/ilisp/Makefile	Mon Aug 13 08:46:56 2007 +0200
@@ -2,56 +2,65 @@
 
 # Makefile --
 # This file is part of ILISP.
-# Version: 5.7
+# Version: 5.8
 #
 # Copyright (C) 1990, 1991, 1992, 1993 Chris McConnell
 #               1993, 1994 Ivan Vasquez
-#               1994, 1995 Marco Antoniotti and Rick Busdiecker
+#               1994, 1995, 1996 Marco Antoniotti and Rick Busdiecker
+#               1996 Marco Antoniotti and Rick Campbell
 #
-# Send mail to 'ilisp-request@lehman.com' to be included in the
+# Send mail to 'ilisp-request@naggum.no' to be included in the
 # ILISP mailing list.
 
-#------------------------------------------------------------------------------
+# Note: this makefile assumes GNU make
+
+#==============================================================================
 # Various Variables
 
-#EMACS=xemacs
-EMACS=emacs
+Version = 5.8
 
-OtherFiles=README HISTORY Makefile ilisp.emacs
+# Use whichever you like most
+#EMACS = xemacs
+#EMACS = /usr/local/bin/emacs
+EMACS = emacs
+
+# The SHELL variable is used only for making the distribution.
+SHELL = /bin/csh
 
-DocFiles=ilisp.texi ilisp.ps.gz ilisp.info ilisp.info-1 ilisp.info-2
+# These are used mostly for packaging the distribution
+Ilisp_src_dir = $(shell pwd)
+Ilisp_tar_dir = ilisp-$(Version)
 
-Version=5.7
+OtherFiles = README         \
+             HISTORY        \
+             Makefile       \
+             ilisp.emacs    \
+             INSTALLATION   \
+             COPYING        \
+             GETTING-ILISP  \
+             Welcome
 
-LoadFiles=ilisp-def.elc ilisp-el.elc ilisp-sym.elc \
+DocFiles = ilisp.texi
+
+LoadFiles = ilisp-def.elc ilisp-el.elc ilisp-sym.elc \
  ilisp-inp.elc ilisp-ind.elc ilisp-prc.elc ilisp-val.elc ilisp-out.elc \
  ilisp-mov.elc ilisp-key.elc ilisp-prn.elc ilisp-low.elc ilisp-doc.elc \
  ilisp-ext.elc ilisp-mod.elc ilisp-dia.elc ilisp-cmt.elc ilisp-rng.elc \
  ilisp-hnd.elc ilisp-utl.elc ilisp-cmp.elc ilisp-kil.elc ilisp-snd.elc \
  ilisp-xfr.elc ilisp-hi.elc ilisp-aut.elc ilisp-cl.elc ilisp-cmu.elc \
- ilisp-acl.elc ilisp-kcl.elc ilisp-luc.elc ilisp-sch.elc ilisp-hlw.elc
+ ilisp-acl.elc ilisp-kcl.elc ilisp-luc.elc ilisp-sch.elc ilisp-hlw.elc \
+ ilisp-xls.elc
 
 
-#------------------------------------------------------------------------------
+#==============================================================================
 # Rules
 
 compile:
 	$(EMACS) -batch -l ilisp-mak.el
 
-id:
-	mkid -S.el=lisp *.el
-
 tags:
 	etags *.el
 
-dist: tarring compressing
-
-tarring:
-	tar cvf ilisp-$(Version).tar $(OtherFiles) *.el *.lisp *.lcd $(DocFiles) *.mail
-
-compressing:
-	gzip ilisp-$(Version).tar
-
 clean: 
 	$(RM) *.elc
 
@@ -61,4 +70,31 @@
 	rm $(LoadFiles)
 # Note that the redirection is done by a Bourne Shell.
 
+compress:
+	gzip *.el $(OtherFiles) $(DocFiles)
+
+#==============================================================================
+# The following targets are used only to create a distribution file.
+
+dist: tarring dist_compressing
+
+tarring:
+	(cd $(Ilisp_src_dir)/..;                                        \
+         if ( $(notdir $(Ilisp_src_dir)) != $(Ilisp_tar_dir) )          \
+            ln -s $(notdir $(Ilisp_src_dir)) $(Ilisp_tar_dir) ;         \
+         tar cvf $(Ilisp_tar_dir).tar                                   \
+            $(patsubst %,$(Ilisp_tar_dir)/%,$(OtherFiles))              \
+            $(Ilisp_tar_dir)/*.el                                       \
+            $(Ilisp_tar_dir)/*.lisp                                     \
+            $(patsubst %,$(Ilisp_tar_dir)/%,$(DocFiles))                \
+            $(Ilisp_tar_dir)/*.mail)
+
+dist_compressing:
+	(cd $(Ilisp_src_dir)/.. ; gzip $(Ilisp_tar_dir).tar)
+
+uuencoding: ../$(Ilisp_tar_dir).tar.gz
+	(cd $(Ilisp_src_dir)/.. ;                                           \
+         uuencode $(Ilisp_tar_dir).tar.gz $(Ilisp_tar_dir).tar.gz > il.uue)
+
+
 # end of file -- Makefile --