bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: vc-list-files and VPATH


From: Jim Meyering
Subject: Re: vc-list-files and VPATH
Date: Thu, 03 Apr 2008 18:29:14 +0200

Eric Blake <address@hidden> wrote:

> With this patch, and the following change in maint.mk:
>
> -VC_LIST = build-aux/vc-list-files
> +VC_LIST = $(srcdir)/build-aux/vc-list-files -C $(srcdir)
>
> it is possible to use vc-list-files from a VPATH build.  This patch also adds 
> --
> help and --version support, as well as using an installed cvsu if one is not
> present in build-aux.  (And yes, it is intentionally not robust to misuse
> like 'vc-list-files -C', because it is assumed that it will be used by
> maintainers who are smart enough to call it correctly and who don't want the
> slowdown from extra error checking).

Thanks for the improvements, but that broke coreutils "make po-check".
I've checked in this fix:

        vc-list-files: don't cause coreutils "make po-check" failure
        * build-aux/vc-list-files: Skip postprocessing when $2 is '.'

diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 35046d5..762d7ee 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
 # List version-controlled file names.

 # Print a version string.
-scriptversion=2008-04-03.14
+scriptversion=2008-04-03.17

 # Copyright (C) 2006-2008 Free Software Foundation, Inc.

@@ -56,7 +56,7 @@ EOF
     exit ;;

   -C)
-    postprocess="| sed 's|^|$2/|'"
+    test "$2" = . || postprocess="| sed 's|^|$2/|'"
     cd "$2" || exit 1
     shift; shift ;;
 esac
--

However, it still doesn't work right for non-srcdir builds, since names
now have the postprocess-added prefix, and that makes it so strict
regular expressions (any starting with '^') in existing .x-sc* files no
longer match.

Fixing this isn't urgent for me, since the only syntax-check failure
was po-check when srcdir == .




reply via email to

[Prev in Thread] Current Thread [Next in Thread]