--- annozilla/src/makefile	2003/03/05 19:37:57	1.3
+++ annozilla/src/makefile	2006/06/27 19:53:42	1.14
@@ -1,10 +1,47 @@
-SOURCE = content/annozilla/* locale/en-US/annozilla/*
+COMPRESS = perl zip.pl
+XPI = ../downloads/annozilla-latest.xpi
 
-xpi: install.js bin/chrome/annozilla.jar
-	jar cfM ../downloads/annozilla-latest.xpi install.js bin/chrome/annozilla.jar
+HELPFILES = locale/en-US/annozilla/help/creating.xhtml \
+            locale/en-US/annozilla/help/editing.xhtml \
+            locale/en-US/annozilla/help/firefox-editor.png \
+            locale/en-US/annozilla/help/general.xhtml \
+            locale/en-US/annozilla/help/help.css \
+            locale/en-US/annozilla/help/index.xhtml \
+            locale/en-US/annozilla/help/languages.xhtml \
+            locale/en-US/annozilla/help/loading.xhtml \
+            locale/en-US/annozilla/help/preferences.xhtml \
+            locale/en-US/annozilla/help/product-firefox.png \
+            locale/en-US/annozilla/help/product-mozilla.png \
+            locale/en-US/annozilla/help/servers.xhtml \
+            locale/en-US/annozilla/help/viewing.xhtml
 
-install: bin/chrome/annozilla.jar
-	cp bin/chrome/annozilla.jar $(MOZILLA)/bin/chrome/annozilla.jar
+SOURCE = content/annozilla/* \
+         content/annozilla/about/* \
+         content/annozilla/editor/* \
+         content/annozilla/icons/* \
+         content/annozilla/prefs/* \
+         content/annozilla/prefs/firefox/* \
+         locale/en-US/annozilla/* \
+         locale/fr-FR/annozilla/* \
+         locale/ja-JP/annozilla/*
+
+xpi: versioncheck install.js install.rdf chrome/annozilla.jar
+	$(COMPRESS) $(XPI) install.js install.rdf chrome/annozilla.jar
+
+chrome/annozilla.jar: $(SOURCE)
+	$(COMPRESS) chrome/annozilla.jar \
+	    `find content/annozilla -name CVS -prune -o -name '*.bak' -o -name Thumbs.db -prune -o -name '.#*' -prune -o -type f -print` \
+	    `find locale -name CVS -prune -o -name '*.bak' -prune -o -name Thumbs.db -prune -o -type f -print`
+
+locale/en-US/annozilla/help/%: ../www/manual/en-US/%
+	cp $< $@
+
+versioncheck:
+	INSTALL_JS=`perl -n -e 'print $$1 if /<em:version>(.*)<\/em:version>/' install.rdf` ;\
+	INSTALL_RDF=`perl -n -e 'print $$1 if /const myProductRegVersion = "(.*)";/' install.js` ;\
+	ABOUT_XUL=`perl -n -e 'print $$1 if /<label id="version" value="(.*)"\/>/' content/annozilla/about/aboutAnnozilla.xul` ;\
+        perl -e "die 'Version incompatibility $$INSTALL_JS/$$INSTALL_RDF/$$ABOUT_XUL' unless $$INSTALL_JS eq $$INSTALL_RDF and $$INSTALL_JS eq $$ABOUT_XUL"
+
+install: xpi
+	cp $(XPI) 'c:/Documents and Settings/matthew/Application Data/Firefox/Profiles/default/xrh4z19c.slt/extensions/'
 
-bin/chrome/annozilla.jar: $(SOURCE)
-	jar cfM bin/chrome/annozilla.jar content/annozilla/*.* locale/en-US/annozilla/*.*