X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=4b7f62dbb6b7f12189c7247715a967d975c0b8a8;hb=a34ae3cf97b43e0d200ff4e25b10fd6fad9494ad;hp=9ab6801340181b7fb58dd9a554c02838a26c98c8;hpb=0657d7bbc96bd322cc798968cd2065b6465add0a;p=debian%2Fdebian-policy.git

diff --git a/Makefile b/Makefile
index 9ab6801..4b7f62d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,16 @@ include debian/rules
 
 policy.sgml: version.ent
 menu-policy.sgml: version.ent
-mime-policy.sgml: version.ent
 perl-policy.sgml: version.ent
 
 %.txt: %.org
-	$(EMACS) --batch -Q -l ./README-css.el -l org -l org-ascii --visit $^ \
-          --funcall org-export-as-ascii >/dev/null 2>&1
+	$(EMACS) --batch -Q -l ./README-css.el -l org --visit $^ \
+          --funcall org-ascii-export-to-ascii
 	test "$@" != "README.txt"  ||                            \
            perl -pli -e 's,./Process.org,Process.txt,g' $@
 %.html: %.org
 	$(EMACS) --batch -Q -l ./README-css.el -l org --visit $^ \
-          --funcall org-export-as-html-batch >/dev/null 2>&1
+	   --funcall org-html-export-to-html
 
 %.validate: %
 	nsgmls -wall -gues $<
@@ -46,6 +45,16 @@ perl-policy.sgml: version.ent
 %.pdf.gz: %.pdf
 	gzip -cf9 $< > $@
 
+# This is a temporary hack to fold the upgrading-checklist into the Policy
+# HTML directory so that it can be deployed alongside Policy on
+# www.debian.org in a way that lets the cross-document links work properly.
+# The correct solution is to make upgrading-checklist an appendix of Policy,
+# which will probably be done as part of a general conversion to DocBook.
+policy.html.tar.gz:: policy.html/upgrading-checklist.html
+policy.html/upgrading-checklist.html: upgrading-checklist-1.html \
+				      policy.html/index.html
+	cp -p $< $@
+
 # convenience aliases :)
 html: policy.html/index.html
 html-1: policy-1.html