From 99a3400ceb3d8dff48941873663e577fa02a6507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 15 Jul 2007 14:49:13 +0000
Subject: [PATCH] Changes from arch/CVS synchronization

---
 ChangeLog   |  8 ++++++++
 Makefile.am |  4 ++--
 autogen.sh  | 30 +-----------------------------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ea515bfa..65aec5a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
 
 	* README: Updated version number.
 
+	* Makefile.am (EXTRA_DIST): Removed `BUGS' (was outdated).
+
+	* ANON-CVS, HACKING, SNAPSHOTS: New, from the `workbook'
+	directory of the CVS repository.
+
+	* autogen.sh: Removed dependency on the `workbook' CVS
+	directory.
+
 	* GUILE-VERSION (GUILE_MICRO_VERSION): Set to 2.
 	(LIBGUILE_INTERFACE_CURRENT): Incremented due to new symbols.
 	(LIBGUILE_INTERFACE_REVISION): Set to 0.
diff --git a/Makefile.am b/Makefile.am
index f021982e6..8de4ab380 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -33,7 +33,7 @@ include_HEADERS = libguile.h
 
 # automake sometimes forgets to distribute acconfig.h,
 # apparently depending on the phase of the moon.
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS
 
 TESTS = check-guile
 
diff --git a/autogen.sh b/autogen.sh
index 18e639b8c..da8ebea10 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Usage: sh -x ./autogen.sh [WORKBOOK]
+# Usage: sh -x ./autogen.sh
 
 set -e
 
@@ -8,34 +8,6 @@ set -e
   exit 1
 }
 
-######################################################################
-### Find workbook and make symlinks.
-
-workbook=../workbook                    # assume "cvs co hack"
-test x$1 = x || workbook=$1
-if [ ! -d $workbook ] ; then
-    echo "ERROR: could not find workbook dir"
-    echo "       re-run like so: $0 WORKBOOK"
-    exit 1
-fi
-: found workbook at $workbook
-workbook=`(cd $workbook ; pwd)`
-
-workbookdistfiles="ANON-CVS HACKING SNAPSHOTS"
-for f in $workbookdistfiles ; do
-    rm -f $f
-    ln -s $workbook/build/dist-files/$f $f
-done
-rm -f examples/example.gdbinit
-ln -s $workbook/build/dist-files/.gdbinit examples/example.gdbinit
-
-# TODO: This should be moved to dist-guile
-mscripts=../guile-scripts
-if test -x $mscripts/render-bugs ; then
-  rm -f BUGS
-  $mscripts/render-bugs > BUGS
-fi
-
 ######################################################################
 ### update infrastructure