summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-06-17 22:21:42 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-06-17 22:21:42 -0700
commitb41b2cc220d9ba53024045fd3f84cd7be495d6a4 (patch)
tree75a7d2bcacb30513f05c15da0e62e71a9367e13f /Makefile
parent90166275e015baddb82e56203b73bf5e1b8014ab (diff)
downloadtxr-b41b2cc220d9ba53024045fd3f84cd7be495d6a4.tar.gz
txr-b41b2cc220d9ba53024045fd3f84cd7be495d6a4.tar.bz2
txr-b41b2cc220d9ba53024045fd3f84cd7be495d6a4.zip
Adding anaphoric ifa macro.
* Makefile (install): Install .tl files present in stdlib directory. (INSTALL): Handle argument 2 being a list. * eval.c (load): New function. * eval.h (load): Declared. * lisplib.c (ifa_set_entries, ifa_instantiate): New functions to lazily load ifa.tl. (lisplib_init): Register new functions. * txr.c (stdlib_path): New variable. (sysroot_init): Store the stdlib path in stdlib_path. * txr.h (stdlib_path): Declared. * share/txr/stdlib/ifa.tl: New file.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a25370fe..31d11f2f 100644
--- a/Makefile
+++ b/Makefile
@@ -345,8 +345,11 @@ define INSTALL
$(call ABBREV3,INSTALL,$(3),$(2))
$(V)mkdir -p $(3)
$(V)cp -f $(2) $(3)
- $(V)chmod $(1) $(3)/$(notdir $(2))
- $(V)for x in $(2) ; do touch -r $$x $(3)/$$(basename $$x) ; done
+ $(V)for x in $(2) ; do \
+ y=$(strip $(3))/$$(basename $$x) ; \
+ touch -r $$x $$y ; \
+ chmod $(1) $$y ; \
+ done
endef
PREINSTALL := :
@@ -358,7 +361,10 @@ install: $(PROG)
$(call INSTALL,0444,$(top_srcdir)/LICENSE,$(DESTDIR)$(datadir))
$(call INSTALL,0444,$(top_srcdir)/METALICENSE,$(DESTDIR)$(datadir))
$(call INSTALL,0444,$(top_srcdir)/txr.1,$(DESTDIR)$(mandir)/man1)
- $(call INSTALL,0444,$(top_srcdir)/share/txr/stdlib/*.txr,$(DESTDIR)$(datadir)/stdlib)
+ $(call INSTALL,0444,\
+ $(addprefix $(top_srcdir)/share/txr/stdlib/,\
+ *.txr *.tl),\
+ $(DESTDIR)$(datadir)/stdlib)
.PHONY: unixtar gnutar zip