--- a/Makefile	Fri Dec 30 19:55:24 2005 -0500
+++ b/Makefile	Fri Dec 30 19:55:33 2005 -0500
@@ -1,62 +1,65 @@
 #!/usr/bin/make
 
-MAKE_RCS_VERSION="$Revision: 1841 $ $Name$"
+MAKE_RCS_VERSION="$Revision: 1883 $ $Name$"
 
 TOP=$(shell pwd)
-
+RULES=$(TOP)/utils/Makefile.rules
 PACKAGE=opera
-
 NAME_SUFFIX=
-HTML_OUTPUTDIR=$(PACKAGE)$(NAME_SUFFIX)
 
-DTD_FILES=
-DTD_INCLUDE=
-SGML_MAIN_FILE=$(PACKAGE).xml
 COPYRIGHT_FILES=COPYING GFDL GFDL_fr HARMONIQUE
 SGML_FILES=$(SGML_MAIN_FILE) $(COPYRIGHT_FILES)
 
-all: dist
-
-validate: valid
+all: rules
 
-include $(TOP)/utils/Makefile.rules
+rules: html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) \
+		PAPERCONF=$$paper paper ; \
+	done
 
-DIST_TARGETS=$(addprefix $(PACKAGE)$(NAME_SUFFIX), .txt .rtf .pdf .html .zip .html.tar.gz)
-
-dist: $(PACKAGE)$(NAME_SUFFIX).fo $(DIST_TARGETS)
+paper: $(PAPER_TARGETS)
 
-.PHONY: all dist
+html: $(HTML_TARGETS)
 
-# $(PACKAGE): ps pdf text html html_one rtf htgz zip dvi
-$(PACKAGE): html
+.PHONY: all rules paper html
+
+install: install-rules
 
-dvi: $(PACKAGE)$(NAME_SUFFIX).dvi
-
-view: $(PACKAGE)$(NAME_SUFFIX).dvi
-	xdvi $<
+install-rules: install-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper install-paper ; \
+	done
 
-text: $(PACKAGE)$(NAME_SUFFIX).txt
-
-print: pdf
+install-paper: $(PAPER_TARGETS)
+	mkdir -p $(INSTALL_DIR)
+	cp -a $(PAPER_TARGETS) $(INSTALL_DIR)
 
-ps: $(PACKAGE)$(NAME_SUFFIX).ps
-#	lpr $@
+install-html: $(HTML_TARGETS)
+	mkdir -p $(INSTALL_DIR)
+	cp -a $(HTML_TARGETS) $(INSTALL_DIR)
 
-html: $(HTML_ROOTFILE)
+.PHONY: install install-rules install-paper install-html install-aides
 
-html_one: $(PACKAGE)$(NAME_SUFFIX).html
+purge: clean purge-rules
 
-pdf: $(PACKAGE)$(NAME_SUFFIX).fo $(PACKAGE)$(NAME_SUFFIX).pdf
-
-rtf: $(PACKAGE)$(NAME_SUFFIX).rtf
-
-htgz: $(PACKAGE)$(NAME_SUFFIX).html.tar.gz
+purge-rules: purge-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper \
+		purge-paper ; \
+	done
 
-zip: $(PACKAGE)$(NAME_SUFFIX).zip
+purge-paper:
+	rm -f $(PAPER_TARGETS)
 
-tex: $(PACKAGE)$(NAME_SUFFIX).tex
+purge-html: 
+	rm -rf $(HTML_TARGETS)
 
-zTXT: $(PACKAGE)$(NAME_SUFFIX).zTXT
+.PHONY: purge purge-rules purge-paper purge-html
+
+include $(RULES)
 
 $(PACKAGE)$(NAME_SUFFIX).html.tar.gz: $(HTML_ROOTFILE)
 	tar -czf $@ $(HTML_OUTPUTDIR)
@@ -64,18 +67,3 @@
 $(PACKAGE)$(NAME_SUFFIX).zip:  $(HTML_ROOTFILE)
 	zip -9r $@ $(HTML_OUTPUTDIR)
 
-purge: clean
-	for paper in $(PAPER_TYPE) ; do			\
-		$(MAKE) PAPERCONF=$$paper purge_it ;	\
-	done
-
-purge_it:
-	rm -f *.fo *.gif *.png *.eps *.svg *.pdf *.ps \
-		$(addprefix $(PACKAGE)$(NAME_SUFFIX), .txt .rtf .ps .pdf .html .html.tar.gz .zip .dvi .tex)
-	rm -rf $(PACKAGE)$(NAME_SUFFIX)
-
-snapshot:
-	rm -f ../$(PACKAGE).tar.bz2
-	$(MAKE) ../$(PACKAGE).tar.bz2
-
-.PHONY:	dvi view text print ps html html_one pdf rtf zTXT purge snapshot