casl2libとtestを整理

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index e9e6678..80f8a82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
 
 VERSION := $(shell $(CAT) VERSION)
 
@@ -31,8 +32,8 @@ VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
 
 VERSIONFILES = include/package.h \
-        test/system/casl2/opt_v/0.txt \
-        test/system/comet2/opt_v/0.txt \
+        test/system/casl2_opt/opt_v/0.txt \
+        test/system/comet2_opt/opt_v/0.txt \
         test/system/dumpword/opt_v/0.txt
 
 all: build doc gtags
@@ -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))