Merge branch 'origin/master' into Weblate.

[text-madewithcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 92f2ef5257ede4118483b77663538390cbce80f8..46ddb4044f5d712b16bc72e6a4e28e516dfe075c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,14 @@ clean:
                rm -f $(SOURCE).$$LANG.$$EXT ;\
            done; \
         done
                rm -f $(SOURCE).$$LANG.$$EXT ;\
            done; \
         done

+       rm -f xsl-fo-$(SOURCE).*.pdf
+       rm -f xsl-fo-$(SOURCE).*.fo

        $(RM) *~
 
 $(SOURCE).md: $(SOURCE).odt fixup.rb
        TEMP=`tempfile -p mwcc` && \
        $(RM) *~
 
 $(SOURCE).md: $(SOURCE).odt fixup.rb
        TEMP=`tempfile -p mwcc` && \

-       pandoc -f odt $(SOURCE).odt -t markdown > $$TEMP && \
-       ruby fixup.rb $$TEMP $(SOURCE).md && \
+       LC_ALL=C.UTF-8 pandoc -f odt $(SOURCE).odt -t markdown > $$TEMP && \
+       LC_ALL=C.UTF-8 ruby fixup.rb $$TEMP $(SOURCE).md && \

        rm $$TEMP
 
 pot: po/mwcc.pot po/*/mwcc.po
        rm $$TEMP
 
 pot: po/mwcc.pot po/*/mwcc.po


@@ -103,7 +105,7 @@ pdf: $(SOURCE).pdf
            $(MAKE) $(SOURCE).$$LANG.pdf ; \
        done
 DBLATEX_OPTS = -T simple -t pdf -b xetex -p extra/pdf.xsl
            $(MAKE) $(SOURCE).$$LANG.pdf ; \
        done
 DBLATEX_OPTS = -T simple -t pdf -b xetex -p extra/pdf.xsl

-%.pdf: %.xml
+%.pdf: %.xml extra/pdf.xsl

        dblatex $(DBLATEX_OPTS) $^
 
 epub: $(SOURCE).epub
        dblatex $(DBLATEX_OPTS) $^
 
 epub: $(SOURCE).epub


@@ -121,7 +123,7 @@ epub: $(SOURCE).epub
 XMLLINTOPTS = --nonet --noout  --xinclude --postvalid
 lint: $(SOURCE).xml
        xmllint $(XMLLINTOPTS) $^
 XMLLINTOPTS = --nonet --noout  --xinclude --postvalid
 lint: $(SOURCE).xml
        xmllint $(XMLLINTOPTS) $^

-lint-es: $(SOURCE).nb.xml
+lint-es: $(SOURCE).es.xml

        xmllint $(XMLLINTOPTS) $^
 lint-nb: $(SOURCE).nb.xml
        xmllint $(XMLLINTOPTS) $^
        xmllint $(XMLLINTOPTS) $^
 lint-nb: $(SOURCE).nb.xml
        xmllint $(XMLLINTOPTS) $^


@@ -132,7 +134,7 @@ check-urls:
        done; exit $$retval
 
 # Experimental build rule to test Docbook XSL + FOP processor 
        done; exit $$retval
 
 # Experimental build rule to test Docbook XSL + FOP processor 

-xsl-fo-%.pdf: %.xml
+xsl-fo-%.pdf: %.xml extra/stylesheet-fo.xsl

        xsltproc --output $(subst .pdf,.fo,$@) \
          extra/stylesheet-fo.xsl $^; \
        fop -fo $(subst .pdf,.fo,$@) -pdf $@
        xsltproc --output $(subst .pdf,.fo,$@) \
          extra/stylesheet-fo.xsl $^; \
        fop -fo $(subst .pdf,.fo,$@) -pdf $@