Update.

1998-01-30 23:37  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile.in: Add comment about CVSOPTS Makefile variable.
	* Makerules: Use CVSOPTS in cvs invocation.
	* Makefile: Likewise.
	* MakeTAGS: Likewise.
	* Make-dist: Likewise.

6 files changed, 22 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index c8254668ae..23ddfaadd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-01-30 23:37  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in: Add comment about CVSOPTS Makefile variable.
+	* Makerules: Use CVSOPTS in cvs invocation.
+	* Makefile: Likewise.
+	* MakeTAGS: Likewise.
+	* Make-dist: Likewise.
+
 1998-01-30 22:37  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/generic/memmem.c: Correct last change.
diff --git a/Make-dist b/Make-dist
index f77eb35507..c4e10180bf 100644
--- a/Make-dist
+++ b/Make-dist
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -188,7 +188,7 @@ foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2)
 define autoconf-it
 autoconf $(ACFLAGS) $< > $@.new
 mv -f $@.new $@
-test ! -d CVS || cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
+test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
 endef
 
 configure: configure.in aclocal.m4; $(autoconf-it)
@@ -225,7 +225,7 @@ README: README.template version.h
 	sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@
 # Make it unwritable so I won't change it by mistake.
 	chmod 444 $@
-	test ! -d CVS || cvs commit -m'Remade for $(release)-$(version)' $@
+	test ! -d CVS || cvs $(CVSOPTS) commit -m'Remade for $(release)-$(version)' $@
 
 
 endif	# Subdirectory vs. parent makefile
diff --git a/MakeTAGS b/MakeTAGS
index 2fe78c123b..8bc587a02c 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -1,6 +1,6 @@
 # Make the TAGS files.
 
-# Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -176,7 +176,7 @@ $P/libc.pot: $(all-pot)
 	    po/header.pot > $@.new
 	$(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new
 	mv -f $@.new $@
-	test ! -d CVS || cvs ci -m'Regenerated from source files' $@
+	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
 
 $(subdirs:%=$P/%.pot): $P/%.pot: FORCE
 	$(MAKE) -C $* no_deps=t ../$@
diff --git a/Makefile b/Makefile
index ed8d327ddc..bad92c6e8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ define autoconf-it
 autoconf $(ACFLAGS) $< > $@.new
 chmod a-w,a+x $@.new
 mv -f $@.new $@
-test ! -d CVS || cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
+test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
 endef
 
 configure: configure.in aclocal.m4; $(autoconf-it)
diff --git a/Makefile.in b/Makefile.in
index 3cb24bf097..8b921c6905 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,5 +5,10 @@ srcdir = @srcdir@
 # Uncomment the line below if you want to do parallel build.
 # PARALLELMFLAGS = -j 4
 
+# This option is for those who modify the sources and keep them in a
+# CVS repository.  Sometimes it is necessary to pass options to the cvs
+# program (not the command), like -z9 or -x.
+# CVSOPTS = -z9
+
 all .DEFAULT:
 	$(MAKE) PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
diff --git a/Makerules b/Makerules
index 62fd79f684..a747ac2a9e 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -956,6 +956,6 @@ $(gpl2lgpl): %: $(..)gpl2lgpl.sed /home/gd/gnu/lib/%
 # So I don't edit them by mistake.
 	chmod a-w $@-tmp
 	mv -f $@-tmp $@
-	test ! -d CVS || cvs commit -m'Updated from $^' $@
+	test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $^' $@
 endif
 endif