summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE10
-rw-r--r--dist/s_copyright8
2 files changed, 6 insertions, 12 deletions
diff --git a/LICENSE b/LICENSE
index 271ccd7051f..6b46629398f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,5 @@
-/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
- * All rights reserved.
- *
- * See the file LICENSE for redistribution information.
- */
+Copyright (c) 2008-2012 WiredTiger, Inc.
+ All rights reserved.
This program is free software: you can redistribute it and/or modify it under
the terms of version 3 of the GNU General Public License as published by the
@@ -14,7 +10,7 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details:
- http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ http://www.gnu.org/licenses/gpl-3.0-standalone.html
For a license to use the WiredTiger software under conditions other than those
described by the GNU General Public License, or for technical support for this
diff --git a/dist/s_copyright b/dist/s_copyright
index 5831e6e63e0..ce8f9970ae3 100644
--- a/dist/s_copyright
+++ b/dist/s_copyright
@@ -68,8 +68,6 @@ check()
echo "$1: copyright information is incorrect"
}
-l="LICENSE COPYING"
-
# Search for files, ignoring test/3rdparty.
for i in `cd .. &&
find [a-z]* -name '*.[chi]' \
@@ -88,9 +86,9 @@ for i in $f; do
echo "$i: copyright information is incorrect"
done
-# The wt utility has a copyright it displays.
-s="printf.*Copyright (c) 2008-$year WiredTiger, Inc."
-f="src/utilities/util_cpyright.c"
+# The wt utility and LICENSE files have a copyright.
+s="Copyright (c) 2008-$year WiredTiger, Inc."
+f="LICENSE src/utilities/util_cpyright.c"
for i in $f; do
if `grep "$s" ../$i > /dev/null`; then
continue;