Commit0760849

committed

Update make merge to generate pots under Doc/locales/pot

1 parent998d15d commit0760849Copy full SHA for 0760849

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all`
`75`	`75`	`$(error "You're merging from a different branch")`
`76`	`76`	`endif`
`77`	`77`	`(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)`
`78`		`-(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0Docpot/)`
`79`		`-find $(CPYTHON_CLONE)/pot/ -name '*.pot' \|\`
	`78`	`+(cd $(CPYTHON_CLONE)/Doc; $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0. locales/pot/)`
	`79`	`+find $(CPYTHON_CLONE)/Doc/locales/pot/ -name '*.pot' \|\`
`80`	`80`	`while read -r POT;\`
`81`	`81`	`do\`
`82`		`- PO="./$$(echo "$$POT" \| sed "s#$(CPYTHON_CLONE)/pot/##; s#\.pot\$$#.po#")";\`
	`82`	`+ PO="./$$(echo "$$POT" \| sed "s#$(CPYTHON_CLONE)/Doc/locales/pot/##; s#\.pot\$$#.po#")";\`
`83`	`83`	`mkdir -p "$$(dirname "$$PO")";\`
`84`	`84`	`if [ -f "$$PO" ];\`
`85`	`85`	`then\`

Comments

(0)