From 79b9ccd285d54f25d0296c8e18f33bdf34b95c10 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Wed, 31 Jan 2001 10:08:14 +0000 Subject: 13412: avoid duplicates in subdirecory list for recursive build --- ChangeLog | 5 +++++ Src/mkmakemod.sh | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ddcd15554..9142942e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-01-31 Andrej Borsenkow + + * 13412: Src/mkmakemod.sh: avoid duplicate subdirectories in + recursive build + 2001-01-29 Andrej Borsenkow * unposted: ChangeLog: typo in previous commit message diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh index 98b9199df..aa5f3c0ec 100644 --- a/Src/mkmakemod.sh +++ b/Src/mkmakemod.sh @@ -132,7 +132,13 @@ if $first_stage; then $the_subdir/$lastsub/*) ;; $the_subdir/*/*) lastsub=`echo $modfile | sed 's,^'$the_subdir'/,,;s,/[^/]*$,,'` - all_subdirs="$all_subdirs $lastsub" + case "$all_subdirs" in + *" $lastsub"* ) ;; + *" $lastsub "* ) ;; + * ) + all_subdirs="$all_subdirs $lastsub" + ;; + esac ;; $the_subdir/*) mddname=`echo $modfile | sed 's,^.*/,,;s,\.mdd$,,'` -- cgit 1.4.1