change order in Makefile filenames: $os.$arch.$rel => $os.$rel.$arch

SCCS-vsn: usr.sbin/sendmail/Files.base 8.21
SCCS-vsn: usr.sbin/sendmail/src/makesendmail 8.15

diff --git a/usr/src/usr.sbin/sendmail/Files.base b/usr/src/usr.sbin/sendmail/Files.base
index 750c9d7..2af270f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/Files.base
+++ b/usr/src/usr.sbin/sendmail/Files.base
@@ -1,4 +1,4 @@
-#      @(#)Files.base  8.20 (Berkeley) %G%
+#      @(#)Files.base  8.21 (Berkeley) %G%

 FAQ
 KNOWNBUGS
 Makefile
 FAQ
 KNOWNBUGS
 Makefile


@@ -84,7 +84,7 @@ src/Makefiles/Makefile.Dynix
 src/Makefiles/Makefile.FreeBSD
 src/Makefiles/Makefile.HP-UX
 src/Makefiles/Makefile.HP-UX.8xx
 src/Makefiles/Makefile.FreeBSD
 src/Makefiles/Makefile.HP-UX
 src/Makefiles/Makefile.HP-UX.8xx

-src/Makefiles/Makefile.UNIX_SV.i386.4.2
+src/Makefiles/Makefile.UNIX_SV.4.2.i386

 src/Makefiles/Makefile.IRIX
 src/Makefiles/Makefile.IRIX64
 src/Makefiles/Makefile.ISC
 src/Makefiles/Makefile.IRIX
 src/Makefiles/Makefile.IRIX64
 src/Makefiles/Makefile.ISC

diff --git a/usr/src/usr.sbin/sendmail/src/makesendmail b/usr/src/usr.sbin/sendmail/src/makesendmail
index 639b2fb..7e50c31 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/makesendmail
+++ b/usr/src/usr.sbin/sendmail/src/makesendmail
@@ -6,7 +6,7 @@
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-#       @(#)makesendmail       8.14 (Berkeley) %G%
+#       @(#)makesendmail       8.15 (Berkeley) %G%

 #
 
 #
 #
 
 #


@@ -64,20 +64,20 @@ then
 fi
 
 # now try to find a reasonable object directory
 fi
 
 # now try to find a reasonable object directory

-if [ -r obj.$os.$arch.$rel ]; then
-       obj=obj.$os.$arch.$rel
-elif [ -r obj.$os.$arch.$rbase.x ]; then
-       obj=obj.$os.$arch.$rbase.x
+if [ -r obj.$os.$rel.$arch ]; then
+       obj=obj.$os.$rel.$arch
+elif [ -r obj.$os.$rbase.x.$arch ]; then
+       obj=obj.$os.$rbase.x.$arch

 elif [ -r obj.$os.$rel ]; then
        obj=obj.$os.$rel
 elif [ -r obj.$os.$rbase.x ]; then
        obj=obj.$os.$rbase.x
 elif [ -r obj.$os.$arch ]; then
        obj=obj.$os.$arch
 elif [ -r obj.$os.$rel ]; then
        obj=obj.$os.$rel
 elif [ -r obj.$os.$rbase.x ]; then
        obj=obj.$os.$rbase.x
 elif [ -r obj.$os.$arch ]; then
        obj=obj.$os.$arch

-elif [ -r obj.$arch.$rel ]; then
-       obj=obj.$arch.$rel
-elif [ -r obj.$arch.$rbase.x ]; then
-       obj=obj.$arch.$rbase.x
+elif [ -r obj.$rel.$arch ]; then
+       obj=obj.$rel.$arch
+elif [ -r obj.$rbase.x.$arch ]; then
+       obj=obj.$rbase.x.$arch

 elif [ -r obj.$os ]; then
        obj=obj.$os
 elif [ -r obj.$arch ]; then
 elif [ -r obj.$os ]; then
        obj=obj.$os
 elif [ -r obj.$arch ]; then


@@ -86,21 +86,21 @@ elif [ -r obj.$rel ]; then
        obj=obj.$rel
 else
        # no existing obj directory -- try to create one if Makefile found
        obj=obj.$rel
 else
        # no existing obj directory -- try to create one if Makefile found

-       obj=obj.$os.$arch.$rel
-       if [ -r Makefiles/Makefile.$os.$arch.$rel ]; then
-               makefile=Makefile.$os.$arch.$rel
-       elif [ -r Makefiles/Makefile.$os.$arch.$rbase.x ]; then
-               makefile=Makefile.$os.$arch.$rbase.x
+       obj=obj.$os.$rel.$arch
+       if [ -r Makefiles/Makefile.$os.$rel.$arch ]; then
+               makefile=Makefile.$os.$rel.$arch
+       elif [ -r Makefiles/Makefile.$os.$rbase.x.$arch ]; then
+               makefile=Makefile.$os.$rbase.x.$arch

        elif [ -r Makefiles/Makefile.$os.$rel ]; then
                makefile=Makefile.$os.$rel
        elif [ -r Makefiles/Makefile.$os.$rbase.x ]; then
                makefile=Makefile.$os.$rbase.x
        elif [ -r Makefiles/Makefile.$os.$arch ]; then
                makefile=Makefile.$os.$arch
        elif [ -r Makefiles/Makefile.$os.$rel ]; then
                makefile=Makefile.$os.$rel
        elif [ -r Makefiles/Makefile.$os.$rbase.x ]; then
                makefile=Makefile.$os.$rbase.x
        elif [ -r Makefiles/Makefile.$os.$arch ]; then
                makefile=Makefile.$os.$arch

-       elif [ -r Makefiles/Makefile.$arch.$rel ]; then
-               makefile=Makefile.$arch.$rel
-       elif [ -r Makefiles/Makefile.$arch.$rbase.x ]; then
-               makefile=Makefile.$arch.$rbase.x
+       elif [ -r Makefiles/Makefile.$rel.$arch ]; then
+               makefile=Makefile.$rel.$arch
+       elif [ -r Makefiles/Makefile.$rbase.x.$arch ]; then
+               makefile=Makefile.$rbase.x.$arch

        elif [ -r Makefiles/Makefile.$os ]; then
                makefile=Makefile.$os
        elif [ -r Makefiles/Makefile.$arch ]; then
        elif [ -r Makefiles/Makefile.$os ]; then
                makefile=Makefile.$os
        elif [ -r Makefiles/Makefile.$arch ]; then