From: rich <rich>
Date: Thu, 21 Oct 2004 11:48:21 +0000 (+0000)
Subject: Fixed 'make install', and link with cocanwiki_version.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=2c61c4ed12f53bc7209275cdd848fe0b0b0b6321;p=cocanwiki.git

Fixed 'make install', and link with cocanwiki_version.
---

diff --git a/scripts/Makefile b/scripts/Makefile
index 277aaf6..c24a331 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,5 +1,5 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.43 2004/10/21 11:42:04 rich Exp $
+# $Id: Makefile,v 1.44 2004/10/21 11:48:21 rich Exp $
 
 include ../Makefile.config
 
@@ -11,12 +11,13 @@ OCAMLCFLAGS := -w s \
 CPP := cpp
 
 SRCS := $(wildcard *.ml)
-ADMINS_SRCS := $(wildcard admin/*.ml)
+ADMIN_SRCS := $(wildcard admin/*.ml)
 
 OBJS := $(SRCS:.ml=.cmo)
 ADMIN_OBJS := $(ADMIN_SRCS:.ml=.cmo)
 
-LIB_OBJS := $(patsubst %,lib/%,$(shell cd lib && ocamldsort -byte *.ml *.mli))
+LIB_OBJS := lib/cocanwiki_version.cmo \
+	$(patsubst %,lib/%,$(shell cd lib && ocamldsort -byte *.ml *.mli))
 
 INSTDIR := ../html/_bin
 
@@ -34,12 +35,12 @@ clean:
 	rm -f admin/*~ admin/*.bak admin/core admin/*.cmi admin/*.cmo
 
 install:
-	exit 1
-#	install -d -m 0755 $(INSTDIR)
-#	install -c -m 0555 cocanwiki.cma $(OBJS) $(INSTDIR)
-#
-#	install -d -m 0755 $(INSTDIR)/admin
-#	install -c -m 0555 $(ADMIN_OBJS) $(INSTDIR)/admin
+	install -d -m 0755 $(INSTDIR)
+	install -c -m 0555 lib/cocanwiki.cma $(INSTDIR)
+	install -c -m 0555 $(OBJS) $(INSTDIR)
+
+	install -d -m 0755 $(INSTDIR)/admin
+	install -c -m 0555 $(ADMIN_OBJS) $(INSTDIR)/admin
 
 %.cmi: %.mli
 	$(OCAMLC) $(OCAMLCFLAGS) -c $<