Re: VCS=(yes|always)

[Kaloian Doganov]

Yavor Doganov <address@hidden> writes:

    It won't work here because $(CVSOPTS) will expand to `-n'.  

    Do you see a specific problem with this?

I understand your reasons, but this solution defeats a basic convention.
One would expect that $(CVS) is always invoked with $(CVSOPTS) so
modifying $(CVSOPTS) will affect all $(CVS) invocations.

We can do it a bit more cleaner way.  The basic idea is to set
$(CVSOPTS) to "" when $(VCS) is either "yes" or "always".  I propose the
following patch:

Index: prep/gnun/GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.11
diff -u -r1.11 GNUmakefile
--- prep/gnun/GNUmakefile       26 Jan 2008 20:09:16 -0000      1.11
+++ prep/gnun/GNUmakefile       27 Jan 2008 06:58:42 -0000
@@ -35,8 +35,8 @@
 # rules already depend on cvs-specific options.
 CVS := cvs
 
-# Do not `cvs add' any files by default unless VCS=yes.
-ifneq (,$(findstring yes,$(VCS)))
+# Do not `cvs add' any files by default unless VCS=(yes|always).
+ifeq (yes,$(subst always,yes,$(VCS)))
 CVSOPTS :=
 else
 CVSOPTS := -n
@@ -210,7 +210,7 @@
 vcs-add-always:
        for file in $(template_translated) $(home_translated) $(ALL_POTS) \
          $(articles_translated) $(wildcard generic.*.html); do \
-         ($(CVS) add $$file ; exit 0) ; done
+         ($(CVS) $(CVSOPTS) add $$file ; exit 0) ; done
 else
 vcs-add-always: ;
 endif