ChangeLogTag: Tue Aug 24 10:37:02 1999 David L. Levine <levine@cs.wustl.edu>

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index f3a9f9a21b1..c182b675230 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,6 +1,12 @@
+Tue Aug 24 10:37:02 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * bin/cvslog (find_changelogs): one more time: append /$file
+          to `pwd`, so that we can find ChangeLogs in child directories.
+          Always call basename (), again.
+
 Tue Aug 24 09:10:58 1999  David L. Levine  <levine@cs.wustl.edu>
 
-        * bin/cvslog (find_changelogs): don't call basename immediately
+        * bin/cvslog (find_changelogs): don't call basename () immediately
           after calling `pwd`, so that ChangeLogs in current directory
           will be found.
 
diff --git a/bin/cvslog b/bin/cvslog
index b48bfbd1921..1330db622f8 100755
--- a/bin/cvslog
+++ b/bin/cvslog
@@ -140,14 +140,15 @@ sub find_changelogs () {
                     "$pwd/[C]hangeLog-97b " .  #### ACE_wrappers
                     "$pwd/ChangeLog-9[89]* " .
                     "$pwd/ChangeLog-0*"))) {
-      if ($pwd =~ m%^${dir_sep}%) {
-        $pwd = &basename ($pwd);
-      } else {
+      if ($pwd !~ m%^${dir_sep}%) {
         #### We're starting with a relative path.  Get the
         #### absolute path.
         chomp ($pwd = `pwd`);
+        $pwd .= "/$file";
       }
 
+      $pwd = &basename ($pwd);
+
       if ($pwd eq '') {
         warn "$0: ChangeLog NOT FOUND for '$file'!!!!\n";
         return ();