From 3a2bd673c97f5276d781f14e51c2f55dcaf17ce3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 14 Feb 2014 20:58:12 +0100 Subject: [PATCH] enhance build scripts for releasing from non-master branch Signed-off-by: Nico Schottelius --- Makefile | 5 +++-- bin/build-helper | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1962c96e..9502c989 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ man-dist: man check-date cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7 cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true -man-fix-link: web-pub +man-latest-link: web-pub # Fix ikiwiki, which does not like symlinks for pseudo security ssh tee.schottelius.org \ "cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest" @@ -146,7 +146,8 @@ web-dist: web-blog web-doc web-pub: web-dist man-dist speeches-dist cd "${WEBDIR}" && make pub -web-release-all: man-fix-link +web-release-all: man-latest-link +web-release-all-no-latest: web-pub ################################################################################ # Release: Mailinglist diff --git a/bin/build-helper b/bin/build-helper index bfd7d31c..1de2eb94 100755 --- a/bin/build-helper +++ b/bin/build-helper @@ -256,7 +256,11 @@ eof make pub # publish man, speeches, website - make web-release-all + if [ "$masterbranch" = yes ]; then + make web-release-all + else + make web-release-all-no-latest + fi # Ensure that pypi release has the right version "$0" version