* Makefile.am: export PREFIX and LISPDIR also.

* Makefile.lisp: don't set those if ones are imported.

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index dc8a1e2..f9bdb7c 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -3,7 +3,9 @@ DISTCLEANFILES = liece-setup.el
 
 EMACS = @EMACS@
 XEMACS = @XEMACS@
-export EMACS XEMACS
+PREFIX = @prefix@
+LISPDIR = @lispdir@
+export EMACS XEMACS PREFIX LISPDIR
 
 all: elc
 

diff --git a/lisp/Makefile.lisp b/lisp/Makefile.lisp
index df0f0d7..2e8ab50 100644 (file)
--- a/lisp/Makefile.lisp
+++ b/lisp/Makefile.lisp
@@ -10,8 +10,12 @@ endif
 FLAGS  = -batch -q -no-site-file
 TAR    = tar
 
-PREFIX = NONE
-LISPDIR        = NONE
+ifndef PREFIX
+       PREFIX  = NONE
+endif
+ifndef LISPDIR
+       LISPDIR = NONE
+endif
 PACKAGEDIR = NONE
 VERSION_SPECIFIC_LISPDIR = NONE