-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Bruno Haible on 7/5/2007 4:20 AM:
>
> This is a bit better, but maybe '%' or ':' are better separators.
'%', maybe. ':', absolutely not. Using a colon will foul up CVS
checkouts to picky file systems (such as anything on Windows).
>
> Generally, I'm not in favour of such a shortcut, because
> - the gain is small, and it's usually better to have just one way
> to achieve a certain functionality rather than two (because each
> of the two will be less well tested than the common way),
> - it doesn't scale; look at a rather populated local directory in [1].
I already mentioned up front that I recognized it wouldn't scale, so I
won't add such a patch to gnulib. Instead, I'm installing this in m4:
2007-07-05 Eric Blake <[EMAIL PROTECTED]>
Fix up gnulib-tool usage.
* m4/gnulib-cache.m4: Change local-dir to local, not `.'.
* version-etc.c.diff: Move to...
* local/lib/version-etc.c.diff: ...here.
* gpl-3.0.texi.diff: Move to...
* local/doc/gpl-3.0.texi.diff: ...here.
- --
Don't work too hard, make some time for fun as well!
Eric Blake [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGjNm+84KuGfSFAYARAkxOAJ47mDTp//DXEHhxZCY3bcN5C33EmgCfbpKG
LEP8gygv9tTFeGvBD8WGerw=
=Lc/q
-----END PGP SIGNATURE-----
Index: gpl-3.0.texi.diff
===================================================================
RCS file: gpl-3.0.texi.diff
diff -N gpl-3.0.texi.diff
--- gpl-3.0.texi.diff 5 Jul 2007 03:53:06 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
---- ../gnulib/doc/gpl-3.0.texi 2007-07-04 11:50:35.890625000 -0600
-+++ doc/gpl-3.0.texi 2007-07-04 20:58:11.468750000 -0600
-@@ -1,5 +1,5 @@
- @node Copying
[EMAIL PROTECTED] GNU General Public License
[EMAIL PROTECTED] GNU General Public License
- @center Version 3, 29 June 2007
-
- @c This file is intended to be included in another file.
-@@ -222,7 +222,7 @@
- conditions:
-
- @enumerate a
[EMAIL PROTECTED]
[EMAIL PROTECTED]
- The work must carry prominent notices stating that you modified it,
- and giving a relevant date.
-
-@@ -670,7 +670,7 @@
- the ``copyright'' line and a pointer to where the full notice is found.
-
- @smallexample
[EMAIL PROTECTED] line to give the program's name and a brief idea of what it
does.}
[EMAIL PROTECTED] line to give the program's name and a brief idea of what it
does.}
- Copyright (C) @var{year} @var{name of author}
-
- This program is free software: you can redistribute it and/or modify
-@@ -693,7 +693,7 @@
- notice like this when it starts in an interactive mode:
-
- @smallexample
[EMAIL PROTECTED] Copyright (C) @var{year} @var{name of author}
[EMAIL PROTECTED] Copyright (C) @var{year} @var{name of author}
- This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show
w}.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type @samp{show c} for details.
Index: version-etc.c.diff
===================================================================
RCS file: version-etc.c.diff
diff -N version-etc.c.diff
--- version-etc.c.diff 5 Jul 2007 03:53:06 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- ../gnulib/lib/version-etc.c 2007-03-24 07:08:51.698250000 -0600
-+++ lib/version-etc.c 2007-07-04 20:26:39.296875000 -0600
-@@ -3,7 +3,7 @@
-
- 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
-- the Free Software Foundation; either version 2, or (at your option)
-+ the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
-@@ -67,7 +67,7 @@
-
- fputs (_("\
- \n\
--License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl.html>\n\
-+License GPLv3+: GNU GPL version 3 or later
<http://gnu.org/licenses/gpl.html>\n\
- This is free software: you are free to change and redistribute it.\n\
- There is NO WARRANTY, to the extent permitted by law.\n\
- \n\
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/m4/Attic/gnulib-cache.m4,v
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.29 gnulib-cache.m4
--- m4/gnulib-cache.m4 5 Jul 2007 03:53:07 -0000 1.1.2.29
+++ m4/gnulib-cache.m4 5 Jul 2007 11:43:37 -0000
@@ -15,10 +15,10 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=. --lib=libm4 --source-base=lib
--m4-base=m4 --doc-base=doc --aux-dir=. --with-tests --no-libtool
--macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec close-stream
closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt
gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer strtol
unlocked-io vasprintf-posix verror version-etc version-etc-fsf xalloc xvasprintf
+# gnulib-tool --import --dir=. --local-dir=local --lib=libm4
--source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --with-tests
--no-libtool --macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec
close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs
getopt gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer
strtol unlocked-io vasprintf-posix verror version-etc version-etc-fsf xalloc
xvasprintf
# Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([.])
+gl_LOCAL_DIR([local])
gl_MODULES([assert avltree-oset binary-io clean-temp cloexec close-stream
closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt
gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer strtol
unlocked-io vasprintf-posix verror version-etc version-etc-fsf xalloc
xvasprintf])
gl_AVOID([])
gl_SOURCE_BASE([lib])
Index: local/doc/gpl-3.0.texi.diff
===================================================================
RCS file: local/doc/gpl-3.0.texi.diff
diff -N local/doc/gpl-3.0.texi.diff
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ local/doc/gpl-3.0.texi.diff 5 Jul 2007 11:43:37 -0000
@@ -0,0 +1,36 @@
+--- ../gnulib/doc/gpl-3.0.texi 2007-07-04 11:50:35.890625000 -0600
++++ doc/gpl-3.0.texi 2007-07-04 20:58:11.468750000 -0600
+@@ -1,5 +1,5 @@
+ @node Copying
[EMAIL PROTECTED] GNU General Public License
[EMAIL PROTECTED] GNU General Public License
+ @center Version 3, 29 June 2007
+
+ @c This file is intended to be included in another file.
+@@ -222,7 +222,7 @@
+ conditions:
+
+ @enumerate a
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ The work must carry prominent notices stating that you modified it,
+ and giving a relevant date.
+
+@@ -670,7 +670,7 @@
+ the ``copyright'' line and a pointer to where the full notice is found.
+
+ @smallexample
[EMAIL PROTECTED] line to give the program's name and a brief idea of what it
does.}
[EMAIL PROTECTED] line to give the program's name and a brief idea of what it
does.}
+ Copyright (C) @var{year} @var{name of author}
+
+ This program is free software: you can redistribute it and/or modify
+@@ -693,7 +693,7 @@
+ notice like this when it starts in an interactive mode:
+
+ @smallexample
[EMAIL PROTECTED] Copyright (C) @var{year} @var{name of author}
[EMAIL PROTECTED] Copyright (C) @var{year} @var{name of author}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show
w}.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type @samp{show c} for details.
Index: local/lib/version-etc.c.diff
===================================================================
RCS file: local/lib/version-etc.c.diff
diff -N local/lib/version-etc.c.diff
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ local/lib/version-etc.c.diff 5 Jul 2007 11:43:37 -0000
@@ -0,0 +1,20 @@
+--- ../gnulib/lib/version-etc.c 2007-03-24 07:08:51.698250000 -0600
++++ lib/version-etc.c 2007-07-04 20:26:39.296875000 -0600
+@@ -3,7 +3,7 @@
+
+ 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
+- the Free Software Foundation; either version 2, or (at your option)
++ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+@@ -67,7 +67,7 @@
+
+ fputs (_("\
+ \n\
+-License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl.html>\n\
++License GPLv3+: GNU GPL version 3 or later
<http://gnu.org/licenses/gpl.html>\n\
+ This is free software: you are free to change and redistribute it.\n\
+ There is NO WARRANTY, to the extent permitted by law.\n\
+ \n\
