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

diff --git a/Makefile b/Makefile
index d9031ff..4b7f62d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,16 @@ include debian/rules
 
 policy.sgml: version.ent
 menu-policy.sgml: version.ent
-mime-policy.sgml: version.ent
+perl-policy.sgml: version.ent
 
-ifneq (,$(strip $(HAVE_ORG_EMACS)))
 %.txt: %.org
 	$(EMACS) --batch -Q -l ./README-css.el -l org --visit $^ \
-          --funcall org-export-as-ascii >/dev/null 2>&1
+          --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
-endif
+	   --funcall org-html-export-to-html
 
 %.validate: %
 	nsgmls -wall -gues $<
@@ -45,6 +45,16 @@ endif
 %.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
@@ -54,8 +64,7 @@ pdf: policy.pdf
 policy: html txt ps pdf
 
 leavealone :=	$(FHS_HTML) $(FHS_FILES) $(FHS_ARCHIVE) \
-		libc6-migration.txt \
-		upgrading-checklist.html virtual-package-names-list.txt
+		libc6-migration.txt
 	      
 .PHONY: distclean
 distclean: