diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -0,0 +1,4 @@ +2005-09-27 Adam Jackson <ajax@freedesktop.org> + + * Makefile.am: + Don't override ${lispdir}, automake predefines it. diff --git a/Makefile.am b/Makefile.am index fc566c6..b081011 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # PERFORMANCE OF THIS SOFTWARE. XEDITDIR = ${libdir}/X11/xedit -lispdir = ${XEDITDIR}/lisp +xedit_lispdir = ${XEDITDIR}/lisp bin_PROGRAMS = xedit noinst_LIBRARIES = liblisp.a libre.a libmp.a @@ -40,7 +40,7 @@ libmp_a_SOURCES = \ # liblisp.a # -liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(lispdir)\" $(XEDIT_CFLAGS) +liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(xedit_lispdir)\" $(XEDIT_CFLAGS) liblisp_a_LIBADD = libmp.a liblisp_a_SOURCES = \ lisp/bytecode.c \ @@ -159,12 +159,12 @@ EXTRA_DIST = lisp/compile.c Xedit-color.ad \ ./lisp/env.c \ lisp/mathimp.c -lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \ +xedit_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \ ${srcdir}/lisp/modules/xedit.lsp \ ${srcdir}/lisp/modules/syntax.lsp \ ${srcdir}/lisp/modules/indent.lsp -progmodesdir = ${lispdir}/progmodes +progmodesdir = $(xedit_lispdir)/progmodes progmodes_DATA = ${srcdir}/lisp/modules/progmodes/c.lsp \ ${srcdir}/lisp/modules/progmodes/html.lsp \ |