install-infoとinstall-casl2libを設定

diff --git a/Makefile b/Makefile
index e9e6678..fae8d3a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
 
 VERSION := $(shell $(CAT) VERSION)
 
@@ -64,6 +65,12 @@ install: casl2 comet2 dumpword install-info install-casl2lib
        $(INSTALL) -d $(bindir)
        $(INSTALL) $(CMD) $(bindir)/
 
+install-info:
+       $(MAKE) -C doc install-info
+
+install-casl2lib:
+       $(MAKE) -C as/casl2lib install-casl2lib
+
 uninstall: uninstall-info uninstall-casl2lib
        $(RM) $(prefix $(bindir)/,$(CMD))
 

diff --git a/as/casl2lib/Makefile b/as/casl2lib/Makefile
index 94e8145..e191cf4 100644 (file)
--- a/as/casl2lib/Makefile
+++ b/as/casl2lib/Makefile
@@ -6,12 +6,12 @@ ECHO ?= echo
 INSTALL ?= install
 
 prefix ?= ~
-casl2libdir ?= $(prefix)/lib/yacasl2
+sharedir ?= $(prefix)/share
 
 install-casl2lib: *.casl
-       $(INSTALL) -d $(casl2libdir)
-       $(INSTALL) $^ $(casl2libdir)/
+       $(INSTALL) -d $(sharedir)/casl2lib
+       $(INSTALL) $^ $(sharedir)/casl2lib/
 
 uninstall-casl2lib:
-       @$(RMF) $(casl2libdir)/*.casl
-       @$(RMDIR) $(casl2libdir) || if test -e $(casl2libdir); then $(ECHO) "$(casl2libdir): files may be added by others."; fi
+       @$(RMF) $(sharedir)/casl2lib/*.casl
+       @$(RMDIR) $(sharedir)/casl2lib || if test -e $(sharedir)/casl2lib; then $(ECHO) "$(sharedir)/casl2lib: files may be added by others."; fi