X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2FMakefile;h=cca402c5be7f7e509a4e37269e31004c573ccbdd;hb=e336401181f56f19ec18175d47462e7a5d5f07e2;hp=277aaf62af4c6dfaf8ca220e433abb27dafd201d;hpb=20923b33c08fccfca617b21935c4a4f6201593f8;p=cocanwiki.git

diff --git a/scripts/Makefile b/scripts/Makefile
index 277aaf6..cca402c 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,22 +1,22 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.43 2004/10/21 11:42:04 rich Exp $
+# $Id: Makefile,v 1.45 2004/10/24 19:25:20 rich Exp $
 
 include ../Makefile.config
 
 OCAMLC := ocamlc
-# XXX Move GregorianDate out of +merjis.
 OCAMLCFLAGS := -w s \
 	-I +apache -I +pcre -I +dbi -I +extlib -I +netstring \
-	-I +merjis -I lib
+	-I +gregoriandate -I lib
 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 +34,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 $<