[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  21d6947dfff228310cc94eed18e4d62253a6fba9 (commit)
      from  3e97d052d4f31b055807d9455b4cb5e24fd40d33 (commit)


- Log -----------------------------------------------------------------
commit 21d6947dfff228310cc94eed18e4d62253a6fba9
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Jan 8 11:01:00 2015 -0500

    Copy LICENSE to source/ to be less brittle.
    
    Copy the LICENSE file to source/license.inc and have the wml
    include that file.  Slightly less brittle/breakable.

-----------------------------------------------------------------------

Summary of changes:
 Makefile           |    3 ++-
 source/license.wml |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e464bd4..9bbca1a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,9 @@ manpages:
 	sh ./run-pod2html.sh $(PODSHOME)
 
 generated:
+	cp -f $(SNAP)/LICENSE source/license.inc
+	cp -f $(PODSHOME)/HOWTO/*.txt docs/HOWTO/.
 	perl run-changelog.pl <$(SNAP)/CHANGES >news/changelog.inc
 	perl run-faq.pl <$(SNAP)/FAQ >support/faq.inc
 	perl run-fundingfaq.pl < support/funding/support-faq.txt >support/funding/support-faq.inc
-	cp $(PODSHOME)/HOWTO/*.txt docs/HOWTO/.
 	( cd news && xsltproc vulnerabilities.xsl vulnerabilities.xml > vulnerabilities.wml )
diff --git a/source/license.wml b/source/license.wml
index d1bbcba..88143d9 100644
--- a/source/license.wml
+++ b/source/license.wml
@@ -8,5 +8,5 @@ This is a copy of the current LICENSE file inside the CVS repository.
 <p>
 
 <pre>
-#include "LICENSE"
+#include "license.inc"
 </pre>