Re: cvs -n

[Kaloian Doganov]

Yavor Doganov <address@hidden> writes:

    I don't think "forcing" is the right word here.

I agree.  This shows my lack of vocabulary.  :-/

    If there is an easy, reliable and clean way to do this, I will not
    object.

I propose this patch:

--- prep/gnun/GNUmakefile       31 Jan 2008 23:05:27 -0000      1.23
+++ prep/gnun/GNUmakefile       1 Feb 2008 09:08:20 -0000
@@ -34,9 +34,9 @@
 
 # Do not `cvs add' any files by default unless VCS=yes.
 ifneq (,$(findstring yes,$(VCS)))
-CVSOPTS :=
+CVSSKIP :=
 else
-CVSOPTS := -n
+CVSSKIP := echo "SKIP:"
 endif
 
 rootdir := ../..
@@ -89,7 +89,7 @@
 
 # The command to add a file to the repository.
 define addfile
-[ -f $@ ] || (touch $@ ; $(CVS) $(CVSOPTS) add $@)
+[ -f $@ ] || (touch $@ ; $(CVSSKIP) $(CVS) add $@)
 endef
 
 # The command to generate pot file which perform additional checks
@@ -126,7 +126,7 @@
 # once.  Create a copy for every PO file in TEMPLATE_LINGUAS so that
 # the build can continue without errors.
 # FIXME: Check if this approach works with gettext >> 0.14.
-       [ -f $$@ ] || (cp $$< $$@ ; $(CVS) $(CVSOPTS) add $$@)
+       [ -f $$@ ] || (cp $$< $$@ ; $(CVSSKIP) $(CVS) add $$@)
        @echo Updating PO file...
        $(MSGMERGE) --update $$@ $$< && touch $$@