Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.136
diff -u -r1.136 Makefile.am
--- Makefile.am	24 Nov 2004 14:55:54 -0000	1.136
+++ Makefile.am	13 Dec 2004 14:34:26 -0000
@@ -218,8 +218,10 @@
 ## Remove old pkgdatadir
 	-rm -rf $(DESTDIR)$(pkgdatadir)
 ## Remove old macro definitions
-	-rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
-	-rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
+	@for p in $(pkgvmacro_DATA); do \
+	  echo "rm -f $(DESTDIR)$(aclocaldir)/$${p#m4/}"; \
+	  rm -f $(DESTDIR)$(aclocaldir)/$${p#m4/}; \
+	done
 
 install-data-hook:
 	chmod +x $(DESTDIR)$(pkgvdatadir)/config.guess
Index: libtoolize.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.4
diff -u -r1.4 libtoolize.m4sh
--- libtoolize.m4sh	29 Nov 2004 13:50:46 -0000	1.4
+++ libtoolize.m4sh	13 Dec 2004 14:34:26 -0000
@@ -443,6 +443,9 @@
         fi
       done
     fi
+
+    # Just use the current directory if all else fails.
+    test -n "$m4dir" || m4dir=.
 }
 
 # func_included_files searchfile
@@ -709,7 +712,7 @@
   func_ltmain_update ltmain.sh "$pkgvdatadirs" "$auxdir"
 
   # Copy libtool's m4 macros to the macro directory, if they are newer.
-  if test -n "$m4dir"; then
+  if test "$m4dir" != .; then
     $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
 
     func_serial_update  libtool.m4 "$pkgvmacrodirs" "$m4dir" \