Minor updates

diff --git a/build/mkversion b/build/mkversion
index 572c72b797118599562c704160651d7bbb24bfd8..636aee081d85ae320208d8da89912fbabc98544c 100755 (executable)
--- a/build/mkversion
+++ b/build/mkversion
@@ -53,16 +53,26 @@ APPLICATION=$1
 WHOWHERE="$USER@`uname -n`:`pwd`"
 
 cat << __EOF__
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation
- * COPYING RESTRICTIONS APPLY.  See COPYRIGHT file in top level directory
- * of this package for details.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 static const char copyright[] =
-"Copyright 1998-2003 The OpenLDAP Foundation\n"
+"Copyright 1998-2003 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =
-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n\t$WHOWHERE\n";
+"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
+"\t$WHOWHERE\n";
 
 __EOF__

diff --git a/build/version.h b/build/version.h
deleted file mode 100644 (file)
index 1f78562..0000000
--- a/build/version.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2003 The OpenLDAP Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- * 
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-static const char copyright[] =
-"Copyright 1998-2003 The OpenLDAP Foundation.  All rights reserved.\n"
-"COPYING RESTRICTIONS APPLY.\n";
-