From 1bd86e0b224420fdf0312b81c184f32cf38f3a87 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 14 Mar 1996 07:14:45 +0000 Subject: [PATCH] * aclocal.m4 (V5_OUTPUT_MAKEFILE): most seds don't deal with "s/\(regex\)*/foo/", so use a loop instead to get rid of extraneous "./" occurences. Do we want srctop and buildtop to have leading "./"s? They do currently. Is this a bug? git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7639 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 8 ++++++++ src/aclocal.m4 | 17 +++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3d2f7a799..7763e4f15 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 14 02:00:10 1996 Tom Yu + + * aclocal.m4 (V5_OUTPUT_MAKEFILE): most seds don't deal with + "s/\(regex\)*/foo/", so use a loop instead to get rid of + extraneous "./" occurences. Do we want srctop and + buildtop to have leading "./"s? They do currently. Is + this a bug? + Sun Mar 10 23:49:19 1996 Mark W. Eichin * aclocal.m4 (KRB5_SIGTYPE): quote the body correctly, so the test diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 57d1c8c51..7d41cb972 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -621,8 +621,10 @@ done AC_OUTPUT($filelist, [EOF ac_reltopdir=`echo $ac_reltopdir | sed \ - -e 's,^\(\./\)*,,g' \ - -e 's,/\(\./\)*,/,g' \ + -e ':LOOP' \ + -e 's,/\./,/,' \ + -e 'tLOOP' \ + -e 's,^\./,,' \ -e 's,/\.$,,g' \ ` test "$ac_reltopdir" = "" && ac_reltopdir=. @@ -650,8 +652,10 @@ for d in $ac_v5_makefile_dirs; do changequote(,)dnl x=`echo $d/ | sed \ -e 's,//*$,/,' \ - -e 's,^\(\./\)*,,g' \ - -e 's,/\(\./\)*,/,g' \ + -e ':LOOP' \ + -e 's,/\./,/,' \ + -e 'tLOOP' \ + -e 's,^\./,,' \ -e 's,/\./$,/,g' \ -e 's,^\./$,,' \ -e 's,[^/]*/,../,g' \ @@ -664,8 +668,9 @@ changequote([,])dnl esac s=`echo $s | sed \ -e 's,//*$,/,' \ - -e 's,^\(\./\)*,,g' \ - -e 's,/\(\./\)*,/,g' \ + -e ':LOOP' \ + -e 's,/\./,/,' \ + -e 'tLOOP' \ -e 's,^\./$,,' \ -e 's,/\.$,,g' \ ` -- 2.26.2