]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Docs: make snapshots pull RELEASENOTES.html from top directory
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 23 Aug 2015 06:35:30 +0000 (23:35 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 23 Aug 2015 06:35:30 +0000 (23:35 -0700)
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.

mksnapshot.sh

index e9e01684877a9ac788c34fd841725a41969dbf3a..c08d70951feab5dc25dfad3022eb0bd926f3e1ec 100755 (executable)
@@ -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