CG: Add LILYPOND_BUILD_DIR environment variable, fix issues 2604 and 2524.

[lilypond.git] / Documentation / contributor / release-work.itexi

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 4828d1ae0ea348b461df37346347411e7177fb93..26a8223584e20ce0cd0121f7d04999131028b4a6 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -83,7 +83,8 @@ checkout displays modified files, you might want to run @code{git reset
 git fetch
 git checkout origin/release/unstable
 git merge origin
-make po-replace
+make -C $LILYPOND_BUILD_DIR po-replace
+mv $LILYPOND_BUILD_DIR/po/lilypond.pot po/
 vi Documentation/web/news-front.itexi Documentation/web/news.itexi
 @end example
 
@@ -186,9 +187,10 @@ make lilypond-upload \
 
 @enumerate
 
-@item Switch back to master and get the updated news:
+@item Update the current staging branch with the current news:
 
 @example
+git fetch
 git checkout origin/staging
 git merge origin/release/unstable
 @end example
@@ -216,6 +218,16 @@ git commit -m "Release: bump version." VERSION
 git push origin HEAD:staging
 @end example
 
+If the push fails with a message like
+
+@example
+ ! [rejected]        HEAD -> staging (non-fast-forward)
+@end example
+
+@noindent
+it means that somebody else updated the staging branch while you were
+preparing your change.  In that case, you need to restart the Post
+Release process.  Otherwise, proceed:
 
 @item (for now) do a @code{make doc} and manually upload:
 
@@ -303,7 +315,8 @@ Run convert-ly on all files, bump parser minimum version.
 Update lilypond.pot:
 
 @example
-make po-replace
+make -C $LILYPOND_BUILD_DIR po-replace
+mv $LILYPOND_BUILD_DIR/po/lilypond.pot po/
 @end example
 
 @item