From 972f074171ead8a5529c8e9da2e35a071446f15d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 25 Mar 1998 22:25:26 +0000 Subject: [PATCH] lisp files can be built --- ChangeLog | 5 +++++ THANKS | 2 +- lib/am/lisp.am | 6 ++++-- lisp.am | 6 ++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56b3ff1c1..edd743975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 25 15:09:56 1998 Tom Tromey + + * lisp.am (install-@DIR@LISP): Allow .el files to appear in build + directory. From Gary V Vaughan. + Mon Mar 23 07:55:04 1998 Tom Tromey * Released 1.2h. diff --git a/THANKS b/THANKS index 039ae56c8..b38d9ccef 100644 --- a/THANKS +++ b/THANKS @@ -18,7 +18,7 @@ Fran Fred Fish fnf@ninemoons.com Garrett D'Amore garrett@qualcomm.com Garth Corral garthc@inktomi.com -Gary V Vaughan garyv@aethos.co.uk +Gary V Vaughan gvaughan@oranda.demon.co.uk Glenn Amerine glenn@pie.mhsc.org Gord Matzigkeit gord@gnu.ai.mit.edu Greg A. Woods woods@most.weird.com diff --git a/lib/am/lisp.am b/lib/am/lisp.am index ab3feb751..9dfc5cab2 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -21,8 +21,10 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LISP)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ +## A header file can be in the source directory or the build directory. + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ diff --git a/lisp.am b/lisp.am index ab3feb751..9dfc5cab2 100644 --- a/lisp.am +++ b/lisp.am @@ -21,8 +21,10 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LISP)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ +## A header file can be in the source directory or the build directory. + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ -- 2.47.2