Make more robust.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 35920b01e2b429586aba94427195bccb22de08e5..db7e38cae1262062d29911afd5597afa2bf7caa1 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-03  Bruno Haible  <bruno@clisp.org>
+
+       * autopoint.in: Unset all other environment variables which influence
+       cvs. Pass -d $CVSROOT explicitly.
+
 2002-05-01  Bruno Haible  <bruno@clisp.org>
 
        * autopoint-files: New directory.

diff --git a/misc/autopoint.in b/misc/autopoint.in
index cede398cd3bd3918d0fa8b456224805460243686..57735358ea5eedb74ff77e9006fb2bb7a6f5ae00 100644 (file)
--- a/misc/autopoint.in
+++ b/misc/autopoint.in
@@ -228,8 +228,21 @@ mkdir "$cvs_dir"
 mkdir "$work_dir"
 CVSROOT="$srcdir/$cvs_dir"
 export CVSROOT
+unset CVS_CLIENT_LOG
+unset CVS_CLIENT_PORT
+unset CVS_PASSFILE
+unset CVS_PASSWORD
+unset CVS_RCMD_PORT
+unset CVS_RSH
+unset CVS_SERVER
+unset CVS_SERVER_SLEEP
+unset CVSREAD
+unset CVSUMASK
+unset CVSWRAPPERS
 
-cvs init
+# Need to pass -d "$CVSROOT", because there may be a CVS directory in the
+# current directory.
+cvs -d "$CVSROOT" init
 gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
 
 cd "$work_dir"