--- Makefile.distrib	2007/07/10 18:48:52	1425
+++ Makefile.distrib	2007/07/10 18:50:54	1449
@@ -81,13 +81,14 @@
 	$(HIDE)$(MAKE) NATIVE=false $@
 endif
 
-install: all install_lib install_doc
-	$(HIDE)mkdir -p $(BINDIR)
-	$(HIDE)mkdir -p $(MANDIR)/man1
+install: all install_bin install_lib install_doc
+
+install_bin:
 	@echo "Install binaries"
+	$(HIDE)mkdir -p $(BINDIR)
 	$(HIDE)$(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) \
                          validate$(EXE) cdo2ml$(EXE) $(BINDIR)/
-	$(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
+	
 
 install_lib:
 	@echo "Build META"
@@ -128,6 +129,7 @@
 # Objects to build
 
 SCHEMA_OBJS = \
+ schema/schema_pcre.cmo \
  schema/schema_types.cmo \
  schema/schema_xml.cmo \
  schema/schema_common.cmo \
@@ -147,7 +149,8 @@
  misc/html.cmo \
  \
  types/sortedList.cmo types/boolean.cmo types/ident.cmo \
- types/intervals.cmo types/chars.cmo types/atoms.cmo \
+ types/intervals.cmo \
+ types/chars.cmo types/atoms.cmo \
  types/normal.cmo \
  types/types.cmo types/sample.cmo types/sequence.cmo types/patterns.cmo \
  types/builtin_defs.cmo \
@@ -208,7 +211,7 @@
 
 VALIDATE_OBJECTS := $(shell for o in $(OBJECTS); do echo $$o; if [ "$$o" = "schema/schema_parser.cmo" ]; then exit 0; fi; done)	# all objects until schema_parser.cmo
 
-CDUCE = $(OBJECTS) driver/run.cmo $(CQL_OBJECTS_RUN)
+CDUCE = $(OBJECTS) $(CQL_OBJECTS_RUN) driver/run.cmo 
 DTD2CDUCE = tools/dtd2cduce.cmo
 
 ALL_OBJECTS = $(OBJECTS) $(NEW_SCHEMA_OBJS) \
@@ -310,6 +313,7 @@
 # Documentation
 
 doc: cduce web/site.cdo
+	mkdir -p web/doc
 	(cd web; ../cduce --run site.cdo --arg doc.xml -o doc)
 
 web/site.cdo: cduce web/xhtml.cdo web/site.cd
@@ -319,9 +323,11 @@
 	./cduce -I web/ --compile web/xhtml.cd
 
 install_doc: doc
+	$(HIDE)mkdir -p $(MANDIR)/man1
+	$(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
 	mkdir -p $(DOCDIR)/img
 	cp web/doc/*.html $(DOCDIR)/
-	cp CHANGES INSTALL INSTALL.WIN32 $(DOCDIR)/
+	cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DOCDIR)/
 	cp web/img/left.gif web/img/right.gif $(DOCDIR)/img