New LICENSE arrangement

8 files changed, 15 insertions, 26 deletions

diff --git a/LICENSE b/LICENSE
index 05d257a..18fe54e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,16 +1,8 @@
-xml/details/expat/*:
-
-MIT License, see the xml/details/expat/LICENSE file for copyright information.
-
-xml/details/genx/*:
-
-MIT License, see the xml/details/genx/LICENSE file for copyright information.
-
-The rest:
-
 MIT License
 
 Copyright (c) 2013-2020 Code Synthesis Tools CC.
+Copyright (c) the Expat authors for the libstudxml/details/expat/* files.
+Copyright (c) the Genx authors for the libstudxml/details/genx/* files.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/libstudxml/buildfile b/libstudxml/buildfile
index 8cb06b2..6d3869d 100644
--- a/libstudxml/buildfile
+++ b/libstudxml/buildfile
@@ -12,16 +12,19 @@ lib{studxml}: details/expat/{                                                 \
    c{xmlparse xmlrole xmltok}                                                 \
 file{ascii.h asciitab.h config.h iasciitab.h internal.h latin1tab.h nametab.h \
      utf8tab.h xmlrole.h xmltok.h xmltok_impl.h xmltok_impl.c xmltok_ns.c}    \
- doc{LICENSE README}                                                          \
+ doc{COPYING README}                                                          \
 }
 
 details/expat/doc{README}@./:  install = false
-details/expat/doc{LICENSE}@./: install = doc/EXPAT-LICENSE
+details/expat/doc{COPYING}@./: install = doc/EXPAT-LICENSE
 
 # Genx.
 #
 lib{studxml}: details/genx/{h{*} c{*} doc{LICENSE README}}
 
+details/genx/doc{README}@./:  install = false
+details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE
+
 # Include the generated version header into the distribution (so that we don't
 # pick up an installed one) and don't remove it when cleaning in src (so that
 # clean results in a state identical to distributed).
@@ -76,6 +79,3 @@ else
   install         = include/libstudxml/
   install.subdirs = true
 }
-
-details/genx/doc{README}@./:  install = false
-details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE
diff --git a/libstudxml/details/expat/LICENSE b/libstudxml/details/expat/COPYING
index dcb4506..dcb4506 100644
--- a/libstudxml/details/expat/LICENSE
+++ b/libstudxml/details/expat/COPYING
diff --git a/libstudxml/details/expat/README b/libstudxml/details/expat/README
index 3b1ced2..4aeb87f 100644
--- a/libstudxml/details/expat/README
+++ b/libstudxml/details/expat/README
@@ -1,2 +1,2 @@
 This directory contains the Expat XML parser library for internal
-use by libstudxml.
+use by libstudxml. See the COPYING file for license.
diff --git a/libstudxml/details/genx/README b/libstudxml/details/genx/README
index 10a7238..638f1f6 100644
--- a/libstudxml/details/genx/README
+++ b/libstudxml/details/genx/README
@@ -1,2 +1,2 @@
 This directory contains a customized version of the Genx XML generator
-library for internal use by libstudxml.
+library for internal use by libstudxml. See the LICENSE file for license.
diff --git a/libstudxml/details/genx/char-props.c b/libstudxml/details/genx/char-props.c
index 680dd13..d50e822 100644
--- a/libstudxml/details/genx/char-props.c
+++ b/libstudxml/details/genx/char-props.c
@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2004 by Tim Bray and Sun Microsystems.
- * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE
- * file for details.
+ * Copyright (c) Code Synthesis Tools CC (see the LICENSE file).
  *
- * For copying permission, see the accompanying COPYING file.
+ * For copying permission, see the accompanying LICENSE file.
  */
 
 /*
diff --git a/libstudxml/details/genx/genx.c b/libstudxml/details/genx/genx.c
index 49b7095..9c82059 100644
--- a/libstudxml/details/genx/genx.c
+++ b/libstudxml/details/genx/genx.c
@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2004 by Tim Bray and Sun Microsystems.
- * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE
- * file for details.
+ * Copyright (c) Code Synthesis Tools CC (see the LICENSE file).
  *
- * For copying permission, see the accompanying COPYING file.
+ * For copying permission, see the accompanying LICENSE file.
  */
 
 #define GENX_VERSION "cs-1"
diff --git a/libstudxml/details/genx/genx.h b/libstudxml/details/genx/genx.h
index 31e5831..041815f 100644
--- a/libstudxml/details/genx/genx.h
+++ b/libstudxml/details/genx/genx.h
@@ -4,10 +4,9 @@
 
 /*
  * Copyright (c) 2004 by Tim Bray and Sun Microsystems.
- * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE
- * file for details.
+ * Copyright (c) Code Synthesis Tools CC (see the LICENSE file).
  *
- * For copying permission, see the accompanying COPYING file.
+ * For copying permission, see the accompanying LICENSE file.
  */
 
 #ifndef GENX_H