Mercurial > hg > octave-lojdl > gnulib-hg

changeset 7872:96efe9fbb2f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For test modules, use the license of the main module.
author Bruno Haible <bruno@clisp.org>
date Sun, 14 Jan 2007 23:00:12 +0000
parents 218f86d19cfa
children eb473ee59fbc
files ChangeLog gnulib-tool
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_get_license): For test modules, use the license of
+	the main module.
+
 2007-01-14  Bruno Haible  <bruno@clisp.org>
 
 	* modules/iconv (Include): Clarify that <iconv.h> can only be included
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-01-14 20:45:45 $'
+cvsdatestamp='$Date: 2007-01-14 23:00:12 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -1020,7 +1020,9 @@
 # - local_gnulib_dir  from --local-dir
 func_get_license ()
 {
-  func_lookup_file "modules/$1"
+  # ${module}-tests always implicitly has the same license as ${module}.
+  sed_drop_tests_suffix='s/-tests$//'
+  func_lookup_file "modules/"`echo "$1" | sed -e "$sed_drop_tests_suffix"`
   sed -n -e "/^License$sed_extract_prog" < "$lookedup_file"
 }