From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 23 Aug 2015 06:35:30 +0000 (-0700)
Subject: Docs: make snapshots pull RELEASENOTES.html from top directory
X-Git-Tag: SQUID_4_0_1~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c34112d87b41a0ed1c76326867780e538eec365;p=thirdparty%2Fsquid.git

Docs: make snapshots pull RELEASENOTES.html from top directory

Prevent the need to go searching for release notes by version. Pull a
a copy from the top-level sources directory if any exist there.

The latest squid 4+ versions will (soon) be creating that file for this
and downstream distributors use.
---

diff --git a/mksnapshot.sh b/mksnapshot.sh
index e9e0168487..c08d70951f 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -94,7 +94,12 @@ if [ -f ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.diff ]; then
     echo ${PACKAGE}-${VERSION}-${suffix}.diff >>${tag}.out
 fi
 
-relnotes=${tmpdir}/doc/release-notes/release-`echo ${VERSION} | cut -d. -f1,2 | cut -d- -f1`.html
+# latest Squid 'make' builds a RELEASENOTES.html at top directory
+relnotes=${tmpdir}/RELEASENOTES.html
+if [ ! -f ${relnotes} ]; then
+	# for older Squid-3.x versions we may need to move find the release notes by version
+	relnotes=${tmpdir}/doc/release-notes/release-`echo ${VERSION} | cut -d. -f1,2 | cut -d- -f1`.html
+fi
 if [ -f ${relnotes} ]; then
 	cp -p ${relnotes} ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html
 	echo ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html >>${tag}.out