Index: ChangeLog
===================================================================
RCS file: /home/cvs/libtool/ChangeLog,v
retrieving revision 1.809
diff -u -r1.809 ChangeLog
--- ChangeLog	2000/10/02 01:18:16	1.809
+++ ChangeLog	2000/10/12 16:58:12
@@ -1,3 +1,8 @@
+2000-10-12  Morten Eriksen <address@hidden>
+
+	* bootstrap: Removed some of the uglier (and not working) hacks
+	with cleaner bootstrapping instructions.
+
 2000-10-02  Gary V. Vaughan  <address@hidden>
 
 	From Bruce Korb <address@hidden>
Index: bootstrap
===================================================================
RCS file: /home/cvs/libtool/bootstrap,v
retrieving revision 1.14
diff -u -r1.14 bootstrap
--- bootstrap	2000/09/17 00:44:48	1.14
+++ bootstrap	2000/10/12 16:58:12
@@ -5,22 +5,19 @@
 
 file=Makefile.in
 
-rm -f acinclude.m4
-ln -s libtool.m4 acinclude.m4
+rm -f aclocal.m4
 # fake the libtool scripts
 touch ltmain.sh
 touch ltconfig
 touch libtoolize
-aclocal
+aclocal -I .
 automake --gnu --add-missing --copy
 autoconf
 
 for sub in libltdl demo depdemo mdemo cdemo; do
   cd $sub
   rm -f acinclude.m4
-  cat ../libtool.m4 > acinclude.m4
-  test "$sub" = libltdl && cat ../ltdl.m4 >> acinclude.m4
-  aclocal
+  aclocal -I ../
   test "$sub" = libltdl && autoheader
   automake --gnits --add-missing
   autoconf