* Makefile.am: Export variables EMACS and XEMACS.

* Makefile.lisp: Don't set variables EMACS and XEMACS when they have
already been set.

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index b4e9471..dc8a1e2 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -1,6 +1,10 @@
 EXTRA_DIST = $(wildcard *.el) Makefile.lisp liece.xpm liece.xbm
 DISTCLEANFILES = liece-setup.el
 
+EMACS = @EMACS@
+XEMACS = @XEMACS@
+export EMACS XEMACS
+
 all: elc
 
 elc package install install-package clean:

diff --git a/lisp/Makefile.lisp b/lisp/Makefile.lisp
new file mode 100644 (file)
index 0000000..300a9ba
--- /dev/null
+++ b/lisp/Makefile.lisp
@@ -0,0 +1,43 @@
+PACKAGE        = liece
+VERSION        = 2.0
+
+ifndef EMACS
+       EMACS   = emacs
+endif
+ifndef XEMACS
+       XEMACS  = xemacs
+endif
+FLAGS  = -batch -q -no-site-file
+TAR    = tar
+
+PREFIX = NONE
+LISPDIR        = NONE
+PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
+
+GOMI     = liece-setup.el *.elc
+
+all: elc
+
+elc: 
+       $(EMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \
+               $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -l ./liece-make.el -f compile-liece \
+               $(PREFIX) $(LISPDIR)
+
+install: elc
+       $(EMACS) $(FLAGS) -l ./liece-make.el -f install-liece \
+               $(PREFIX) $(LISPDIR)
+
+package:
+       $(XEMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \
+               $(PREFIX) $(LISPDIR)
+       $(XEMACS) $(FLAGS) -l ./liece-make.el -f compile-liece-package \
+               $(PACKAGEDIR)
+
+install-package: package
+       $(XEMACS) $(FLAGS) -l ./liece-make.el -f install-liece-package \
+               $(PACKAGEDIR)
+
+clean:
+       -rm -f $(GOMI)