Texinfo licenses

diff --git a/config/ChangeLog b/config/ChangeLog
index 18913a85c2f3bea682fd02bf8927a60bfaf95a05..66615568afc64276e4c4ea186641b90b84917a9c 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-18  Karl Berry  <karl@gnu.org>
+
+       * srclistvars.sh (GNUWWWLICENSES): new variable.
+       * srclist.txt ({fdl,gpl,lgpl}.text): get from there.
+
 2004-01-14  Karl Berry  <karl@gnu.org>
 
        * install-sh: update from automake.

diff --git a/config/srclist.txt b/config/srclist.txt
index cdd8a391dce038b427cf3adc03214060363467e2..26d5719f9dd6917ba238a9274c3d0b1e68fe1813 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.31 2003-12-24 13:07:08 uid65818 Exp $
+# $Id: srclist.txt,v 1.32 2004-01-18 14:54:16 karl Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -15,7 +15,9 @@ $TEXINFOSRC/doc/texinfo.tex   config
 
 $AUTOCONF/INSTALL              doc
 #
-$GNUORG/fdl.texi               doc
+$GNUWWWLICENSES/fdl.texi       doc
+$GNUWWWLICENSES/gpl.texi       doc
+$GNUWWWLICENSES/lgpl.texi      doc
 
 $GETTEXT/gettext-runtime/libasprintf/asnprintf.c       lib gpl
 $GETTEXT/gettext-runtime/libasprintf/asprintf.c                lib gpl

diff --git a/config/srclistvars.sh b/config/srclistvars.sh
index bfc450283b1dec4fb3de0890b6e749e21bc84839..0018122e893f5ac5307550e0fe95530301565fa6 100644 (file)
--- a/config/srclistvars.sh
+++ b/config/srclistvars.sh
@@ -1,4 +1,4 @@
-# $Id: srclistvars.sh,v 1.11 2003-09-08 21:00:16 karl Exp $
+# $Id: srclistvars.sh,v 1.12 2004-01-18 14:54:16 karl Exp $
 # Variables for srclist-update and srclist.txt.
 # Will change for each user.
 
@@ -22,7 +22,7 @@ karl)
   : ${GNUBIN=/usr/local/gnu/bin}
   : ${GNUCONFIG=$HOME/gnu/src/config}
   : ${GNULIBSRC=$HOME/gnu/src/gnulib}
-  : ${GNUORG=$HOME/gnu/gnuorg}
+  : ${GNUWWWLICENSES=$HOME/gnu/www/licenses}
   : ${LIBCSRC=$HOME/gnu/src/libc}
   : ${TEXINFOSRC=/u/texinfo/src}
   : ${TEXMFROOT=/usr/local/texmf/texmf}

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 848b4ca3a335c5ceb2ed015fe414673ab95b6393..6c93ff8f9de295d6a0cba8ae7e99553139055c65 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-18  Karl Berry  <karl@gnu.org>
+
+       * gpl.texi, lgpl.texi: new files.
+
 2003-03-13  Paul Eggert  <eggert@twinsun.com>
 
        * COPYING.DOC, fdl.texi: Sync with latest FSF version.