[src/netbsd-1-6]: src/distrib/sets Pull up revision 1.50 (requested by thorpe...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60a2120ca664
branches:  netbsd-1-6
changeset: 529381:60a2120ca664
user:      he <he%NetBSD.org@localhost>
date:      Mon Nov 18 00:45:26 2002 +0000

description:
Pull up revision 1.50 (requested by thorpej in ticket #664):
  If ad.${machine_arch} exists, prefer it over ad.${machine_cpu}
  because it will have more specific information.

diffstat:

 distrib/sets/makeflist |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 3137aa51d7ca -r 60a2120ca664 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sun Nov 17 01:13:11 2002 +0000
+++ b/distrib/sets/makeflist    Mon Nov 18 00:45:26 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.47.2.2 2002/07/23 09:15:47 lukem Exp $
+# $NetBSD: makeflist,v 1.47.2.3 2002/11/18 00:45:26 he Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -100,7 +100,12 @@
 for setname in $lists; do
        cat $setd/lists/$setname/mi
        if [ "$machine" != "$machine_arch" ]; then
-               if [ -f $setd/lists/$setname/ad.${machine_cpu} ]; then
+               # Prefer an ad.${machine_arch} over an ad.${machine_cpu},
+               # since the arch-specific one will be more specific than
+               # the cpu-specific one.
+               if [ -f $setd/lists/$setname/ad.${machine_arch} ]; then
+                       cat $setd/lists/$setname/ad.${machine_arch}
+               elif [ -f $setd/lists/$setname/ad.${machine_cpu} ]; then
                        cat $setd/lists/$setname/ad.${machine_cpu}
                fi
                if [ "$shlib" != "no" -a \