1681 support for BUILD64=# no longer works

@@ -22,10 +22,12 @@
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2014 Andrew Stormont.
+#
 
 LIBBASENAME=    libc
 LIBRARY=        $(LIBBASENAME:%=%.a)
 VERS=           .1
 

@@ -127,11 +129,11 @@
 $(ROOTVARIANTDIR64)                     := FILEMODE= 755
 $(ROOTVARIANTDIR64)/$(VAR1_DYNLIB64)    := FILEMODE= 755
 
 .KEEP_STATE:
 
-all:    all_h lib32 $(BUILD64) .WAIT lib64 .WAIT etc THIRDPARTYLICENSE
+all:    all_h lib .WAIT etc THIRDPARTYLICENSE
 
 THIRDPARTYLICENSE: extract-copyright
         $(RM) $@
         ./extract-copyright . > $@
 

@@ -149,10 +151,12 @@
                 $(ECHO) "Error: Invalid reference to environ" ; \
                 $(ECHO) "Error: See comments in port/gen/env_data.c" ; \
                 exit 1; \
         fi
 
+lib: lib32 $(BUILD64) .WAIT lib64
+
 $(MACH)/assym.h $(MACH64)/assym.h:
         @cd $(@D); $(MAKE) assym.h
 
 $(VARIANTLIBS): FRC
         @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F)

@@ -164,26 +168,25 @@
         @cd $(@); pwd; $(MAKE) $(TARGET)
 
 $($(MACH)_COMP): FRC
         @cd $(@); pwd; $(MAKE) $(TARGET)
 
-install:        all                     \
-                etc                     \
-                inslib32                \
-                $(BUILD64) inslib64
+install:        all etc inslib
 
 inslib32:       $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTFS_LINT) \
                 $(ROOTFS_LINTLIB) \
                 $(ROOTVARIANTLIBS)
 
 inslib64:       $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \
                 $(ROOTFS_LINTLIB64) \
                 $(ROOTVARIANTLIBS64)
 
+inslib: inslib32 $(BUILD64) inslib64
+
 install_h: all_h $(ROOTHDRS)
 
-all_h:  $(MACH)/assym.h $(MACH64)/assym.h
+all_h:  $(MACH)/assym.h $(BUILD64) $(MACH64)/assym.h
 
 check:  $(CHECKHDRS)
 
 $(ROOTFS_LIB)/%: $(MACH)/%
         $(INS.file)