--- a/Makefile	Mon Dec 26 20:05:40 2005 -0500
+++ b/Makefile	Fri Dec 30 19:54:54 2005 -0500
@@ -1,29 +1,40 @@
-SRCS=nargir.xml
-DEPENDS=$(addprefix nargir/,nargir.xml preface.xml 7dragons.xml bete.xml gardien.xml genese.xml)
+TOP=$(shell pwd)
+PACKAGE=nargir
+MAIN_FILE=$(PACKAGE).xml
+DEPENDS=nargir.xml \
+	preface.xml \
+	7dragons.xml \
+	bete.xml \
+	gardien.xml \
+	genese.xml
+DEPENDS:=$(addprefix book1/,$(DEPENDS))
 SGML_CATALOG_FILES=/etc/sgml/catalog
-OUTPUT=$(addprefix nargir,.html .pdf .txt -html)
-REMOTE_HOST=www.tzone.org
-REMOTE_DIR=/var/www/harmonies/harmonies/nargir
+OUTPUT=$(addprefix $(PACKAGE),.html .pdf .txt) $(PACKAGE)
+INSTALL_DIR=$(TOP)/install
 
-all: $(basename $(SRCS))
+all: $(OUTPUT)
 
-nargir: $(addprefix nargir,.html .pdf .txt -html/index.html)
+install: all
+	mkdir -p $(INSTALL_DIR)
+	cp -a $(OUTPUT) $(INSTALL_DIR)
 
-nargir.fo: $(DEPENDS)
-nargir.html: $(DEPENDS)
-nargir-html/index.html: $(DEPENDS)
+$(PACKAGE): $(PACKAGE)/index.html
+
+$(PACKAGE).fo: $(DEPENDS)
+$(PACKAGE).html: $(DEPENDS)
+$(PACKAGE)/index.html: $(DEPENDS)
 
 %.fo: %.xml styles/%-print.xsl styles/%.xsl
 	xsltproc --xinclude -o $@ styles/$(basename $<)-print.xsl $<
 
 %.pdf: %.fo
 	fop $< $@
-	# xmlto pdf -o $(dir $@) $<
+#	xmlto pdf -o $(dir $@) $<
 
 %.html: %.xml styles/%-html.xsl styles/%.xsl
 	xsltproc --xinclude -o $@ styles/$(basename $<)-html.xsl $<
 
-%-html/index.html: %.xml styles/%-chunked.xsl styles/%.xsl
+%/index.html: %.xml styles/%-chunked.xsl styles/%.xsl
 	rm -rf $(dir $@)
 	mkdir -p $(dir $@)
 	xsltproc --xinclude -o $(dir $@) styles/$(basename $<)-chunked.xsl $<
@@ -31,10 +42,6 @@
 %.txt: %.html
 	w3m -dump $< > $@
 
-update: $(OUTPUT)
-	rsync -az $(OUTPUT) $(REMOTE_HOST):$(REMOTE_DIR)
-	ssh $(REMOTE_HOST) chmod -R a+rX $(REMOTE_DIR)
-
 clean:
 	rm -rf *.fo