--- a/Makefile	Fri Dec 30 19:55:33 2005 -0500
+++ b/Makefile	Fri Dec 30 19:56:24 2005 -0500
@@ -1,9 +1,9 @@
 #!/usr/bin/make
 
-MAKE_RCS_VERSION="$Revision: 1883 $ $Name$"
+MAKE_RCS_VERSION="$Revision: 1885 $ $Name$"
 
-TOP=$(shell pwd)
-RULES=$(TOP)/utils/Makefile.rules
+TOP?=$(shell pwd)
+RULESDIR?=$(TOP)
 PACKAGE=opera
 NAME_SUFFIX=
 
@@ -14,24 +14,34 @@
 
 rules: html
 	for paper in $(PAPER_TYPE) ; do \
-		make TOP=$(TOP) RULES=$(RULES) \
+		make TOP=$(TOP) RULESDIR=$(RULESDIR) \
 		PAPERCONF=$$paper paper ; \
 	done
 
+install: install-rules $(PACKAGE).tar.bz2
+	cp -a $(PACKAGE).tar.bz2 $(INSTALL_DIR)
+
+install-rules: install-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper install-paper ; \
+	done
+
+purge: clean purge-rules
+
+purge-rules: purge-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper \
+		purge-paper ; \
+	done
+
+include $(RULESDIR)/Makefile.rules
+
 paper: $(PAPER_TARGETS)
 
 html: $(HTML_TARGETS)
 
-.PHONY: all rules paper html
-
-install: install-rules
-
-install-rules: install-html
-	for paper in $(PAPER_TYPE) ; do \
-		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
-		PAPERCONF=$$paper install-paper ; \
-	done
-
 install-paper: $(PAPER_TARGETS)
 	mkdir -p $(INSTALL_DIR)
 	cp -a $(PAPER_TARGETS) $(INSTALL_DIR)
@@ -40,30 +50,21 @@
 	mkdir -p $(INSTALL_DIR)
 	cp -a $(HTML_TARGETS) $(INSTALL_DIR)
 
-.PHONY: install install-rules install-paper install-html install-aides
-
-purge: clean purge-rules
-
-purge-rules: purge-html
-	for paper in $(PAPER_TYPE) ; do \
-		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
-		PAPERCONF=$$paper \
-		purge-paper ; \
-	done
-
 purge-paper:
 	rm -f $(PAPER_TARGETS)
 
 purge-html: 
 	rm -rf $(HTML_TARGETS)
 
-.PHONY: purge purge-rules purge-paper purge-html
-
-include $(RULES)
-
 $(PACKAGE)$(NAME_SUFFIX).html.tar.gz: $(HTML_ROOTFILE)
 	tar -czf $@ $(HTML_OUTPUTDIR)
 
 $(PACKAGE)$(NAME_SUFFIX).zip:  $(HTML_ROOTFILE)
 	zip -9r $@ $(HTML_OUTPUTDIR)
 
+.PHONY: all rules paper html
+
+.PHONY: install install-rules install-paper install-html install-aides
+
+.PHONY: purge purge-rules purge-paper purge-html
+