279-gary-fix-bootstrap-clobber.diff

[Gary V. Vaughan]

Okay to commit?

I've been wondering why my metadata kept disappearing between
commits... find's -depth argument has a weird interaction with -prune,
and {arch}/libtool ends up being trashed.

Cheers,
        Gary.

 ChangeLog |    5 +++++
 bootstrap |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: libtool--devo--1.0/ChangeLog
===================================================================
--- libtool--devo--1.0.orig/ChangeLog
+++ libtool--devo--1.0/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Gary V. Vaughan  <address@hidden>
+
+       * bootstrap: Don't clobber the working copy metadata in
+       ./{arch}/libtool during bootstrap.
+
 2005-09-22  Peter Ekberg  <address@hidden>,
            Ralf Wildenhues <address@hidden>
 
Index: libtool--devo--1.0/bootstrap
===================================================================
--- libtool--devo--1.0.orig/bootstrap
+++ libtool--devo--1.0/bootstrap
@@ -65,8 +65,9 @@ WARNING: them with all m4 file as shippe
 WARNING: `lt~obsolete.m4').  After that, retry this bootstrap.
 EOF
 
-find . -name '{arch}' -prune -o \( -name autom4te.cache -o -name libtool \) \
-       -depth -exec rm -rf \{\} \;
+find . \( -name autom4te.cache -o -name libtool \) -depth -print \
+  | grep -v '{arch}' \
+  | xargs rm -rf
 
 # Delete stale files from previous libtool versions.
 rm -f acinclude.m4 libltdl/config.h
-- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook