X-Git-Url: https://pere.pagekite.me/gitweb/text-madewithcc.git/blobdiff_plain/cad86ab2fddbd46996c61e27cd2563e81f3ba8c3..5cf53ab6970cc861d1ac3c2ef7e0ecc18bd5ec15:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 6cd997d..4e94cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,10 @@ all: pdf epub
 
 distclean: clean
 	rm -f $(SOURCE).md
+clean:
 	for LANG in $(LANGS); do \
 	    rm -f $(SOURCE).$$LANG.md ;\
 	done
-clean:
 	for EXT in aux cb cb2 glo idx lof log tex toc xml pdf epub; do \
 	    rm -f $(SOURCE).$$EXT ;\
 	    for LANG in $(LANGS); do \
@@ -80,6 +80,7 @@ $(SOURCE).xml: $(SOURCE).md fixup-docbook.rb
 	  pandoc -s -o $$TEMP $(PANDOC_OPTS) $(SOURCE).md && \
 	  ruby fixup-docbook.rb $$TEMP $@ && \
 	  rm $$TEMP
+	xmllint --format $@ > $@.new && mv $@.new $@
 
 pdf: $(SOURCE).pdf
 	for LANG in $(LANGS); do \
@@ -101,8 +102,7 @@ DBLATEX_OPTS = -T simple -t tex -b xetex -p extra/pdf.xsl
 # handled by LaTeX/dblatex, see <URL: https://bugs.debian.org/889603 >.
 %.tex: %.xml
 	dblatex $(DBLATEX_OPTS) $^
-	perl -p -i -e 's/ / /g; \
-		s/\\chapter\{(Colophon|Dedication)\}/\\chapter*{}/;' $@
+	perl -p -i -e 's/ / /g' $@
 
 XMLLINTOPTS = --nonet --noout  --xinclude --postvalid
 lint: $(SOURCE).xml
@@ -114,7 +114,7 @@ lint-nb: $(SOURCE).nb.xml
 
 check-urls:
 	retval=0; for u in $$(perl -n -e'/<ulink url="(.+)"\/>/ && print "$$1\n"' MadewithCreativeCommonsmostup-to-dateversion.xml | sort -u); do \
-	  HEAD -H "User-Agent: Docbook XML URL checker" "$$u" > /dev/null || echo "error fetching $$u"; retval=1; \
+	  GET -H "User-Agent: Docbook XML URL checker" "$$u" > /dev/null || echo "error fetching $$u"; retval=1; \
 	done; exit $$retval
 
 # Experimental build rule to test Docbook XSL + FOP processor