projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment.
[gnulib.git]
/
gnulib-tool
diff --git
a/gnulib-tool
b/gnulib-tool
index
ccbf45c
..
c091a3e
100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-2,10
+2,10
@@
#
# Copyright (C) 2002-2007 Free Software Foundation, Inc.
#
#
# Copyright (C) 2002-2007 Free Software Foundation, Inc.
#
-# This program is free software
;
you can redistribute it and/or modify
+# This program is free software
:
you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version
2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version
3 of the License, or
+#
(at your option)
any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is meant for authors or maintainers which want to import
#
# This program is meant for authors or maintainers which want to import
@@
-1213,7
+1212,7
@@
func_get_filelist ()
func_get_dependencies ()
{
# ${module}-tests always implicitly depends on ${module}.
func_get_dependencies ()
{
# ${module}-tests always implicitly depends on ${module}.
- echo "$1" | sed -n -e 's/-tests//p'
+ echo "$1" | sed -n -e 's/-tests
$
//p'
# Then the explicit dependencies listed in the module description.
func_lookup_file "modules/$1"
sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
# Then the explicit dependencies listed in the module description.
func_lookup_file "modules/$1"
sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
@@
-1247,6
+1246,18
@@
func_get_automake_snippet ()
case "$1" in
*-tests)
# *-tests module live in tests/, not lib/.
case "$1" in
*-tests)
# *-tests module live in tests/, not lib/.
+ # Synthesize an EXTRA_DIST augmentation.
+ all_files=`func_get_filelist $1`
+ tests_files=`for f in $all_files; do \
+ case $f in \
+ tests/*) echo $f ;; \
+ esac; \
+ done | sed -e 's,^tests/,,'`
+ extra_files="$tests_files"
+ if test -n "$extra_files"; then
+ echo "EXTRA_DIST +=" $extra_files
+ echo
+ fi
;;
*)
# Synthesize an EXTRA_DIST augmentation.
;;
*)
# Synthesize an EXTRA_DIST augmentation.
@@
-3527,7
+3538,12
@@
func_create_megatestdir ()
func_append megasubdirs "ALL"
# Create autobuild.
func_append megasubdirs "ALL"
# Create autobuild.
- cvsdate=`sh "$gnulib_dir/build-aux/mdate-sh" "$gnulib_dir/CVS/Entries" \
+ cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \
+ vc_witness="$gnulib_dir/CVS/Entries"; \
+ else \
+ vc_witness="$gnulib_dir/.git/refs/heads/master"; \
+ fi; \
+ sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \
| sed -e 's,January,01,' -e 's,Jan,01,' \
-e 's,February,02,' -e 's,Feb,02,' \
-e 's,March,03,' -e 's,Mar,03,' \
| sed -e 's,January,01,' -e 's,Jan,01,' \
-e 's,February,02,' -e 's,Feb,02,' \
-e 's,March,03,' -e 's,Mar,03,' \